Skip to content

Instantly share code, notes, and snippets.

@saadlu

saadlu/gist:9e783efa66d633dbe5d122c488f030c8

Last active December 28, 2018 16:03
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save saadlu/9e783efa66d633dbe5d122c488f030c8 to your computer and use it in GitHub Desktop.
Save saadlu/9e783efa66d633dbe5d122c488f030c8 to your computer and use it in GitHub Desktop.
Download ZIP
What is ours/theirs - GREEN, PURPLE?
Raw
gistfile1.txt
## Scenario
1. You have interactivelly gone back in time by `git rebase -i`
2. You have changed the commit
3. On continuing the rebase (with `git rebase --continue`), you will re-base the descentdant commits.
4. You get a conflict.
## What is the state?
You got a conflict rebasing a set of commits on your commit. The commit that is causing the conflict, is the "remote"
commit.
### On the file
The HEAD section show what is coming from LOCAL version of the file, that is due to the anscestor commit on which you are
rebasing
The section, with the commit name, show what is being rebased upon. This is REMOTE guy.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment