Resolve merge conflicts after stash pop#32
Merged
jacebrowning merged 1 commit intomasterfrom Apr 11, 2016
Merged
Conversation
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
0f8699b to
d574197
Compare
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
297b6de to
7d2a17b
Compare
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
7d2a17b to
be0521e
Compare
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
be0521e to
7d08e7d
Compare
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
7d08e7d to
8f59ed3
Compare
jacebrowning
force-pushed
the
handle-merge-conflicts
branch
from
8f59ed3 to
5d87a84
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.