Update Checkout and Merge - #505
Merged
tbranyen merged 4 commits intoMar 22, 2015
Merged
tbranyen merged 4 commits into
tbranyen merged 4 commits into
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Author
|
Wat? Not sure why the first 5 commits are showing here. Pretty positive I branched from master... |
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
|
That's weird. Rebase on master? |
Sorry, something went wrong.
Checkout.head futzes with the index, and that's not what we want in a branch checkout
Don't need to manipulate the index in this scenario
orderedlist
force-pushed
the
ol-checkout-and-merge-index
branch
from
1880360 to
7775aa7
Compare
March 22, 2015 17:39
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
3 participants
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.
Checkout.head manipulates the index, where in these scenarios we only want to update the working tree. Tests now verify the index isn't changed when merging and checking out.