ensuring correct git branch before "pulling" #8
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
Rather than performing a git pull, (which merges the desired branch into the current one, even if they aren't the same), this ensures the repo is on the correct branch before merging. Fixes bevry#7
|
I'll take note of this. What are possible side effects that could occur from this change? |
|
I've been using this branch in production for a while and haven't had any issues. |
balupton
requested changes
Sep 20, 2016
There was a problem hiding this comment.
Seems good to me. Difference is that the original way merged changes into the current branch, which I guess may be undesirable. The new change swaps the branch, which I guess is desirable. I don't really know which is more desirable. However considering the reason for this PR, seems the change is. We should explain this reasoning or link to this PR in the comment. Then good to merge.
|
Actually a link to this PR in the comment should be the way to go. |
balupton
added a commit
to docpad/docpad-plugin-repocloner
that referenced
this pull request
Apr 16, 2017
- updated base files - updated dependencies - wiki clone no longer works, so used new orphan branch - orphan branch doesn’t work due to bevry/safeps#8 which has fix - default repo name to repo url
balupton
approved these changes
Apr 16, 2017
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.
Rather than performing a git pull, (which merges the desired branch into the current one, even if they aren't the same), this ensures the repo is on the correct branch before merging.
Fixes #7
I went with this variation instead of
reset --hardoption because it's less likely to surprise anyone by overwriting their local changes.