contributing: commiter git FAQ #68
Closed
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
Describe in details how our current git flow works and could be used. Fix nodejs#67
|
|
||
| ```sh | ||
| git fetch origin | ||
| git merge --ff-only origin/v0.12 |
There was a problem hiding this comment.
Is there a reason to prefer fetch + ff-only merge over git pull --rebase?
There was a problem hiding this comment.
I think the fetch + merge is much more explicit.
|
Left two suggestions and there is a typo in the commit log (s/commiter/committer/) but, apart from that, LGTM. |
|
+1 |
|
@bnoordhuis pushed a fix |
|
Cheers, LGTM. |
|
Landed in dca1ee4, thank you! |
|
wasn't there talk of automating all of this? |
|
@mikeal there was, but knowing how to use git is still good. And this could be a good starting point for a people working on that tool. |
Closed
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.
Describe in details how our current git flow works and could be used.
Fix #67