git merge/rebaseでconflictした時、git checkout --ours/--theirs が何を指しているのかを整理する。 準備 mkdir test cd test git init touch file git add file git commit -am 'init' git checkout -b alice master echo 'alice 1' >> file git commit -am 'alice 1' echo 'alice 2' >> file git commit -am 'alice 2' echo 'alice 3' >> file git commit -am 'alice 3' git checkout -b bob master echo 'bob 1' >> file git commit -am 'bob 1' echo
![gitでconflictした時のours/theirs - Qiita](https://cdn-ak-scissors.b.st-hatena.com/image/square/06d550a7e22b4dafe05a4fc7b2bae55f5f54b837/height=288;version=1;width=512/https%3A%2F%2Fqiita-user-contents.imgix.net%2Fhttps%253A%252F%252Fcdn.qiita.com%252Fassets%252Fpublic%252Farticle-ogp-background-9f5428127621718a910c8b63951390ad.png%3Fixlib%3Drb-4.0.0%26w%3D1200%26mark64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTkxNiZoPTMzNiZ0eHQ9Z2l0JUUzJTgxJUE3Y29uZmxpY3QlRTMlODElOTclRTMlODElOUYlRTYlOTklODIlRTMlODElQUVvdXJzJTJGdGhlaXJzJnR4dC1jb2xvcj0lMjMyMTIxMjEmdHh0LWZvbnQ9SGlyYWdpbm8lMjBTYW5zJTIwVzYmdHh0LXNpemU9NTYmdHh0LWNsaXA9ZWxsaXBzaXMmdHh0LWFsaWduPWxlZnQlMkN0b3Amcz1hZDg3YmIxOTdjMTRhYTNjNTI5NGEwMzcwMGNmMDVkMA%26mark-x%3D142%26mark-y%3D112%26blend64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTYxNiZ0eHQ9JTQwVFRvdWthJnR4dC1jb2xvcj0lMjMyMTIxMjEmdHh0LWZvbnQ9SGlyYWdpbm8lMjBTYW5zJTIwVzYmdHh0LXNpemU9MzYmdHh0LWFsaWduPWxlZnQlMkN0b3Amcz03ODQ4OWQyZGZmOTgwYzBkYmZkNzUzYjhiODE5MmUyMg%26blend-x%3D142%26blend-y%3D491%26blend-mode%3Dnormal%26s%3D45a983012c0a830d9ef01dd43c74faaa)