Document merge conflict resolution process in CONTRIBUTING.md. #12212
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
cjcenizal
force-pushed
the
chore/resolve-merge-conflicts
branch
from
0ec685a to
a2f1d01
Compare
kimjoar
approved these changes
Jun 8, 2017
There was a problem hiding this comment.
Not sure how deeply we should go into things like this. I wish there was a good resource we could link to instead. But I'm okey with it, and the explanation is good.
We should explain upstream though. It's important that people pull from Kibana master, not their fork's master.
|
|
||
| ``` | ||
| git checkout master | ||
| git fetch upstream |
There was a problem hiding this comment.
This is the first time this doc mentions upstream, we should probably explain what it is (if we already need this to explain people git)
Also, I usually git pull --rebase upstream master, but two commands is probably okey ;)
|
Thanks @kjbekkelund I updated per your point. |
jimgoodwin
added
Team:Core
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.
Rebasing can be tricky. Merge conflicts even trickier. We should refer people to these instructions when we request a rebase.