--ours is always index stage 2 and the top half of a conflict. --theirs is always stage 3 and the bottom half. What changes is which commit each operation puts there. Every output below comes from Git
Markdown supported · ⌘↵ to post
No responses yet.