Some of git’s nomenclature can be confusing, especially since it is context dependent. Following are some TLDR;s for dealing with resolving merge conflicts in different scenarios.
–ours vs –theirs
The meaning of --ours vs --theirs can depend on whether you are doing a rebase or a merge.
Assuming that the feature branch is checked out
git merge develop | git rebase develop | |
To keep changes from develop | --theirs | --ours |
To keep changes from feature | --ours | --theirs |
If, during a rebase there → Continue reading “Git Merge Conflict Resolution Cheat Sheet”