Toggle navigation
George Opritescu
Blog
Tags
About
Read the Tutorial
Fork on GitHub
ours and theirs in git rebase
Developer from somewhere
$
git checkout branch1
$
git rebase master
ours = master theirs = branch1