Extension Bar Update #190
Merged
Extension Bar Update #190
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
persn
requested changes
May 5, 2017
There was a problem hiding this comment.
The code and all is good, but you messed up the git branching. I told you this before I believe, GitHub does all the merging you need to do for you, the only techniques you should need to care about is re-basing. Try doing a rebase on LateStartStudio:master, if that doesn't work you'll need to create a new branch and cherry pick your two commits into it.
I'm also going to keep nagging you about that you should create a new branch with a distinct name when you do any kind of work to avoid situations like #99.
|
Notice the blue line here, that is a completely new branch in the history, notice how it runs completely separate from the rest of the git history
|
…ons to 'Dark', add asset references to monogame, update ExtensionBar class for new icons and toggle behavior. Issue LateStartStudio#182
persn
approved these changes
May 9, 2017
persn
added a commit
to persn/Hero6
that referenced
this pull request
May 9, 2017
For some reason when GitHub merged Pull Request LateStartStudio#190 renamed files became added files instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added dark/light toggle on mouse enter/leave.