---
title: "Discussion on \"Git Ours vs Theirs Cheat Sheet: Merge, Rebase, Cherry-Pick, Revert, Pull and Stash\" | Hashnode"
description: "Discussion on \"Git Ours vs Theirs Cheat Sheet: Merge, Rebase, Cherry-Pick, Revert, Pull and Stash\". --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"
url: "https://hashnode.com/posts/git-ours-vs-theirs-cheat-sheet-merge-rebase-cherry-pick-revert-pull-and-stash/6aea109cb6104d273956f865"
---

[Feed](https://hashnode.com/feed) /

Discussion

[DevOps Daily](https://hashnode.com/@devopsdaily)

The latest news, tutorials, and guides for DevOps professionals.

5d ago

# [Git Ours vs Theirs Cheat Sheet: Merge, Rebase, Cherry-Pick, Revert, Pull and Stash](https://thedevopsdaily.hashnode.dev/git-ours-vs-theirs-cheat-sheet-merge-rebase-cherry-pick-revert-pull-and-stash?utm_source=hashnode&utm_medium=feed)

\--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

thedevopsdaily.hashnode.dev 6 min read

## Responses

Markdown supported · ⌘↵ to post

No responses yet.