[Git] Gitã®mergeã§vimdiffを利用ã™ã‚‹ - Qiita目的 pullã—ãŸã¨ãã«ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆãŒç™ºç”Ÿã—ãŸã¨ããªã©vimdiffを利用ã—ã¦ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã‚’解消ã™ã‚‹ æ‰‹é † 1. 使ã„ã©ã“゠例ãˆã°ä»¥ä¸‹ã®ã‚ˆã†ã«git pullãŒå¤±æ•—ã—ã¦æ‰‹å‹•ã§mergeã™ã‚‹å¿…è¦ãŒã§ã¦ããŸã¨ãã«åˆ©ç”¨ã—ã¾ã™ $ git pull ～ Auto-merging aaa CONFLICT (content): Merge conflict in aaa Automatic merge failed; fix conflicts and then commit the result.
![[Git] Gitã®mergeã§vimdiffを利用ã™ã‚‹ - Qiita](https://cdn-ak-scissors.b.st-hatena.com/image/square/b1f27fec92c0020d9648ffa3b753c1b8161b5f8d/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-412672c5f0600ab9a64263b751f1bc81.png%3Fixlib%3Drb-4.0.0%26w%3D1200%26mark64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTk3MiZoPTM3OCZ0eHQ9JTVCR2l0JTVEJTIwR2l0JUUzJTgxJUFFbWVyZ2UlRTMlODElQTd2aW1kaWZmJUUzJTgyJTkyJUU1JTg4JUE5JUU3JTk0JUE4JUUzJTgxJTk5JUUzJTgyJThCJnR4dC1hbGlnbj1sZWZ0JTJDdG9wJnR4dC1jb2xvcj0lMjMxRTIxMjEmdHh0LWZvbnQ9SGlyYWdpbm8lMjBTYW5zJTIwVzYmdHh0LXNpemU9NTYmcz1iNTk1MWYzZTljMzE0Njg3MGU0NmQ4ODlmZjVmYmFjZg%26mark-x%3D142%26mark-y%3D57%26blend64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZoPTc2Jnc9NzcwJnR4dD0lNDBzaGlnZWtpbW9ubyZ0eHQtY29sb3I9JTIzMUUyMTIxJnR4dC1mb250PUhpcmFnaW5vJTIwU2FucyUyMFc2JnR4dC1zaXplPTM2JnR4dC1hbGlnbj1sZWZ0JTJDdG9wJnM9OGI3MzQ0MzYyNGNiZjMxMTc4NmRkOTIyMTM0YWY4NTI%26blend-x%3D142%26blend-y%3D486%26blend-mode%3Dnormal%26s%3D495f658e102082c6da72472e3aedd975)
{{#tags}}- {{label}}
{{/tags}}