{"id":3509,"date":"2016-02-25T09:39:57","date_gmt":"2016-02-25T00:39:57","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=3509"},"modified":"2016-02-25T09:39:57","modified_gmt":"2016-02-25T00:39:57","slug":"tips-tools-to-solve-git-conflicts","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/tips-tools-to-solve-git-conflicts","title":{"rendered":"Git \u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b 14 \u306e\u30d2\u30f3\u30c8\u3068\u30c4\u30fc\u30eb"},"content":{"rendered":"<p>Git \u306f\u30b3\u30fc\u30c9\u306e\u30de\u30fc\u30b8\u3092\u975e\u5e38\u306b\u5f97\u610f\u3068\u3057\u3066\u3044\u307e\u3059\u3002\u30de\u30fc\u30b8\u3068\u306f\u30ed\u30fc\u30ab\u30eb\u3067\u9ad8\u901f\u3001\u305d\u3057\u3066\u67d4\u8edf\u306b\u884c\u3048\u308b\u3082\u306e\u3067\u3059\u3002\u5f53\u7136\u306e\u3053\u3068\u3067\u3059\u304c\u3001\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u8ab0\u304b\u304c\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u30de\u30fc\u30b8\u3059\u308b\u305f\u3073\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u307e\u3059\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u306b\u306f\u3001\u4e3b\u306a\u5909\u66f4\u70b9\u3092\u628a\u63e1\u3057\u3066\u898b\u629c\u304b\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u306f\u3001\u6642\u306b\u306f\u591a\u304f\u306e\u4f5c\u696d\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u958b\u767a\u8005\u306b\u306f\u305d\u308c\u305e\u308c\u597d\u307f\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6c7a\u65b9\u6cd5\u304c\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u305f\u3081\u540c\u50da\u30e9\u30a4\u30bf\u30fc\u306e\u30c0\u30f3\u30fb\u30b9\u30c6\u30a3\u30fc\u30d6\u30f3\u304c\u4ee5\u524d\u3001<a href=\"https:\/\/ja.atlassian.com\/software\/confluence-questions\/\">Questions for Confluence<\/a> \u3092\u4f7f\u7528\u3057\u3066\u793e\u5185\u306e\u4eba\u306b\u8cea\u554f\u3057\u3066\u3044\u307e\u3057\u305f\u3002<\/p>\n<p><a href=\"https:\/\/ja.atlassian.com\/software\/confluence-questions\/\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/questions-e1456358790155.png\" alt=\"questions\" width=\"600\" height=\"519\" class=\"alignnone size-full wp-image-3511\" \/><\/a><\/p>\n<p>\u8fd4\u3063\u3066\u304d\u305f\u56de\u7b54\u3068\u6d1e\u5bdf\u306f\u30a2\u30c8\u30e9\u30b7\u30a2\u30f3\u793e\u54e1\u3060\u3051\u3067\u306f\u306a\u304f\u3001\u3082\u3063\u3068\u591a\u304f\u306e\u4eba\u306b\u5f79\u7acb\u3064\u3082\u306e\u3067\u3057\u305f\u3002\u305d\u3053\u3067\u79c1\u305f\u3061\u304c Git \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u3055\u307e\u3056\u307e\u306a\u65b9\u6cd5\u3092\u4ee5\u4e0b\u306b\u8a73\u3057\u304f\u6ce8\u91c8\u4ed8\u304d\u3067\u7d39\u4ecb\u3057\u307e\u3059\u3002\u7686\u3055\u307e\u306e\u6bce\u65e5\u306e\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u4f5c\u696d\u306b\u5f79\u7acb\u3064\u30a2\u30a4\u30c7\u30a2\u3084\u65b9\u6cd5\u304c\u3053\u3053\u3067\u5f97\u3089\u308c\u308b\u3053\u3068\u3092\u9858\u3044\u307e\u3059\u3002<\/p>\n<h2 id=\"general-setup-tips\">\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u4e00\u822c\u306e\u30d2\u30f3\u30c8<\/h2>\n<p>\u305d\u308c\u3067\u306f Git \u3092\u9069\u5207\u306b\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u30de\u30fc\u30b8\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u57fa\u672c\u7684\u306a\u8a2d\u5b9a\u304b\u3089\u59cb\u3081\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<h3 id=\"1-setup-tips\">1. \u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306e\u30d2\u30f3\u30c8<\/h3>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u751f\u3058\u305f\u5834\u5408\u3001\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u306b\u300c<tt>git mergetool<\/tt>\u300d\u3068\u5165\u529b\u3059\u308b\u304b\u30d3\u30b8\u30e5\u30a2\u30eb\u30c4\u30fc\u30eb\u3092\u4f7f\u3063\u3066\u30de\u30fc\u30b8\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb\u3067\u304d\u307e\u3059\u3002\u304a\u597d\u307f\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6c7a\u30bd\u30d5\u30c8\u3067 Git \u306e\u8a2d\u5b9a\u3092\u3059\u308b\u306b\u306f\u300c<tt>.gitconfig<\/tt>\u300d\u5185\u3067\u300c<tt>merge.tool<\/tt>\u300d\u5909\u6570\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u305f\u3068\u3048\u3070\u3001<a href=\"http:\/\/kdiff3.sourceforge.net\/\">KDiff3<\/a> \u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u30fc\u306f\u3001\u300c<tt>.gitconfig<\/tt>\u300d<em>merge<\/em> \u30bb\u30af\u30b7\u30e7\u30f3\u306b\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u8a18\u8ff0\u3059\u308b\u3068\u826f\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n<pre><code class=\"lang-ini\">[merge]\r\ntool=\"kdiff3\"<\/code><\/pre>\n<p>\u3053\u308c\u306f\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3092\u5165\u529b\u3059\u308b\u306e\u3068\u540c\u3058\u3067\u3059\u3002<\/p>\n<pre><code class=\"lang-bash\">git config --global merge.tool kdiff3<\/code><\/pre>\n<h3 id=\"2-show-common-ancestor-in-conflict-markers\">2. \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u306b\u5171\u901a\u3059\u308b\u7956\u5148\u3092\u8868\u793a\u3059\u308b<\/h3>\n<p><a href=\"http:\/\/psung.blogspot.nl\/2011\/02\/reducing-merge-headaches-git-meets.html\">\u5171\u901a\u306e\u7956\u5148\u3082\u8868\u793a\u3067\u304d\u308b\u3088\u3046\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3092\u6539\u5584\u3059\u308b<\/a>\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u8a2d\u5b9a\u3092\u3057\u307e\u3059 (\u30ed\u30d3\u30f3\u30fb\u30b9\u30c8\u30c3\u30ab\u30fc\u3068\u30d2\u30e5\u30fc\u30fb\u30ae\u30c7\u30f3\u30ba\u306b\u611f\u8b1d)\u3002<\/p>\n<pre><code class=\"lang-bash\">git config --global merge.conflictstyle diff3<\/code><\/pre>\n<p>\u3053\u306e\u8a2d\u5b9a\u3067\u30de\u30fc\u30ab\u30fc <tt>|||||||<\/tt> \u306e\u3042\u308b\u65b0\u3057\u3044\u30bb\u30af\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u6ce8\u91c8\u3092\u4ed8\u3051\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u554f\u984c\u306e 2 \u30d6\u30e9\u30f3\u30c1\u306e\u5171\u901a\u7956\u5148\u3067\u3042\u308b\u30b3\u30df\u30c3\u30c8\u3092\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u884c\u304c\u3069\u306e\u3088\u3046\u306b\u53c2\u7167\u3057\u3066\u3044\u308b\u306e\u304b\u304c\u5206\u304b\u308a\u307e\u3059\u3002<\/p>\n<h3 id=\"3-use-the-patience-algorithm-in-merges\">3. \u30de\u30fc\u30b8\u306b\u300cpatience\u300d\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u4f7f\u3046<\/h3>\n<p><tt>XML<\/tt> \u30d5\u30a1\u30a4\u30eb\u306e\u3088\u3046\u306a\u9577\u3044\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u3042\u308b\u5834\u5408\u3084 2 \u3064\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u5206\u5c90\u3057\u305f\u5834\u5408\u306a\u3069\u3001\u3082\u3046\u4e00\u5ea6\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30de\u30fc\u30b8\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<pre><code class=\"lang-bash\">git merge --strategy-option=patience<\/code><\/pre>\n<p><tt>patience<\/tt> \u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u95a2\u6570\u3084\u30bf\u30b0\u306e\u4e0d\u9069\u5207\u306a\u62ec\u5f27\u3092\u8abf\u6574\u3059\u308b\u52a9\u3051\u306b\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u306e\u8a73\u7d30\u306f\u3001<a href=\"http:\/\/stackoverflow.com\/questions\/4045017\/what-is-git-diff-patience-for\">Stack Overflow \u306e\u56de\u7b54<\/a> \u3067\u3054\u53c2\u7167\u9802\u3051\u307e\u3059\u3002<\/p>\n<h3 id=\"4-when-you-need-information-on-the-history-of-a-single-file\">4. \u5358\u4e00\u30d5\u30a1\u30a4\u30eb\u306e\u5c65\u6b74\u306b\u95a2\u3059\u308b\u60c5\u5831\u304c\u5fc5\u8981\u306a\u5834\u5408<\/h3>\n<p>\u30d5\u30a1\u30a4\u30eb\u306b\u8d77\u3053\u3063\u305f\u3053\u3068\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306b <a href=\"https:\/\/www.sourcetreeapp.com\/\">SourceTree<\/a> \u306a\u3069\u306e\u30d3\u30b8\u30e5\u30a2\u30eb\u30c4\u30fc\u30eb\u3092\u4f7f\u7528\u3059\u308b\u4ed6\u306b\u306f\u3001\u4ee5\u4e0b\u304c\u5229\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"lang-bash\">git log --merge --decorate --source -p path\/to\/file\/you\/care\/about<\/code><\/pre>\n<h2 id=\"solving-conflicts-manually\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u624b\u52d5\u3067\u89e3\u6c7a\u3059\u308b<\/h2>\n<p>\u30de\u30fc\u30b8\u306b\u5bfe\u3059\u308b\u4f5c\u696d\u306b\u304a\u3044\u3066 2 \u3064\u306e\u6d3e\u95a5\u304c\u5b58\u5728\u3057\u307e\u3059\u3002\u4f4e\u30ec\u30d9\u30eb\u30d7\u30ed\u30bb\u30b9\u3092\u4f7f\u7528\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3092\u624b\u4f5c\u696d\u3067\u64cd\u4f5c\u3059\u308b\u958b\u767a\u8005\u3001\u305d\u3057\u3066\u30d3\u30b8\u30e5\u30a2\u30eb\u30c4\u30fc\u30eb\u3092\u597d\u3093\u3067\u4f7f\u7528\u3059\u308b\u958b\u767a\u8005\u3067\u3059\u3002\u3069\u3061\u3089\u3082\u6975\u3081\u3066\u52b9\u679c\u7684\u3067\u3059\u3002<\/p>\n<h3 id=\"5-sample-process\">5. \u30b5\u30f3\u30d7\u30eb\u30d7\u30ed\u30bb\u30b9<\/h3>\n<p>\u540c\u50da\u6570\u4eba\u304c\u624b\u52d5\u306e\u30d7\u30ed\u30bb\u30b9\u3092\u30b7\u30a7\u30a2\u3057\u3066\u304f\u308c\u307e\u3057\u305f\u3002\u4f8b\u3068\u3057\u3066\u30b8\u30a7\u30a4\u30bd\u30f3\u30fb\u30d2\u30f3\u30c1\u306e\u4f5c\u696d\u3092\u6319\u3052\u307e\u3059\u3002<\/p>\n<ul>\n<li>\n<p>\u307e\u305a\u624b\u52d5\u3067\u30de\u30fc\u30b8\u3092\u884c\u3046\u3002<\/p>\n<pre><code class=\"lang-shell\">git merge the\/other\/branch\r\ngit status<\/code><\/pre>\n<\/li>\n<li>\n<p>\u30d5\u30a1\u30a4\u30eb\u304c\u3069\u306e\u3088\u3046\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u304b\u3092\u78ba\u8a8d\u3059\u308b\u3002<\/p>\n<\/li>\n<li>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u5404\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3057\u3066\u4ee5\u4e0b\u3092\u884c\u3046\u3002<\/p>\n<ul>\n<li>\u597d\u304d\u306a\u30a8\u30c7\u30a3\u30bf (IntelliJ \u307e\u305f\u306f vim \u306a\u3069) \u3067\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f\u3002<\/li>\n<li>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3067\u56f2\u307e\u308c\u3066\u3044\u308b\u5404\u30d6\u30ed\u30c3\u30af  (&#8220;<tt>&gt;&gt;&gt;&gt;<\/tt>&#8221; \u3068 &#8220;<tt>&lt;&lt;&lt;&lt;<\/tt>&#8220;) \u3092\u78ba\u8a8d\u3059\u308b\u3002<\/li>\n<li>\u305d\u308c\u304c\u9069\u5207\u304b\u3069\u3046\u304b\u3001\u8a18\u8ff0\u3057\u305f\u4eba\u306e\u610f\u56f3\u306f\u4f55\u306a\u306e\u304b\u3092\u78ba\u8a8d\u3057\u3066\u3001\u53ef\u80fd\u306a\u3089\u89e3\u6c7a\u3059\u308b\u3002<\/li>\n<li>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u304c\u610f\u5473\u3092\u306a\u3055\u306a\u3044\u5834\u5408 (\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u304c\u591a\u3044\u5834\u5408\u306b\u306f\u3088\u304f\u3042\u308b)\u3001\u4ee5\u4e0b\u3092\u5b9f\u884c\u3059\u308b\u3002<\/p>\n<pre><code class=\"lang-bash\">git diff HEAD...the\/other\/branch -- path\/to\/conflicting\/file\r\ngit diff the\/other\/branch...HEAD -- path\/to\/conflicting\/file<\/code><\/pre>\n<p>\u3053\u308c\u3067\u3069\u3061\u3089\u306e\u5909\u66f4\u70b9\u304c\u5c11\u306a\u3044\u304b\u78ba\u8a8d\u3067\u304d\u308b\u3002<\/p>\n<\/li>\n<li>\n<p>\u30b3\u30de\u30f3\u30c9<\/p>\n<pre><code class=\"lang-bash\">git log -p HEAD..the\/other\/branch -- path\/to\/conflicting\/file\r\ngit log -p the\/other\/branch..HEAD -- path\/to\/conflicting\/file<\/code><\/pre>\n<p>\u3053\u308c\u3089\u3092\u4f7f\u3046\u3053\u3068\u3067\u305d\u308c\u305e\u308c\u306e\u5909\u66f4\u70b9\u304c\u660e\u3089\u304b\u306b\u306a\u308b\u3053\u3068\u304c\u591a\u3044\u3002<\/p>\n<\/li>\n<li>\n<p>\u5909\u66f4\u70b9\u306e\u4e00\u756a\u591a\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u623b\u3059\u3002<\/p>\n<pre><code class=\"lang-bash\">git checkout the\/other\/branch -- path\/to\/conflicting\/file<\/code><\/pre>\n<p>(\u3042\u308b\u3044\u306f\u3001<tt>git checkout --theirs<\/tt> \u307e\u305f\u306f <tt>--ours<\/tt> \u3092\u4f7f\u3063\u3066\u3082\u826f\u3044)<\/p>\n<\/li>\n<li>\n<p>\u624b\u52d5\u3067\u78ba\u8a8d\u3057\u3066\u3001\u5909\u66f4\u3092\u3082\u3046\u4e00\u65b9\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u53cd\u6620\u3059\u308b\u3002<\/p>\n<pre><code class=\"lang-bash\">git add path\/to\/conflicting\/file<\/code><\/pre>\n<\/li>\n<li>\n<p>\u3059\u3079\u3066\u306e\u5909\u66f4\u3092\u4fee\u6b63\u3057\u305f\u3089\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d3\u30eb\u30c9\u3057\u3066\u3001\u6700\u4f4e\u3067\u3082\u30b3\u30f3\u30d1\u30a4\u30eb\u3092\u3059\u308b\u3002\u7c21\u5358\u306b\u30c6\u30b9\u30c8\u3067\u304d\u308b\u5834\u5408\u306f\u30c6\u30b9\u30c8\u3082\u884c\u3046\u3002<\/p>\n<pre><code class=\"lang-bash\">git commit<\/code><\/pre>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n<p>\u5c11\u3057\u9762\u5012\u306b\u898b\u3048\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u304c\u3001\u30b8\u30a7\u30a4\u30bd\u30f3\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3067\u306f\u826f\u304f\u306a\u3044\u30de\u30fc\u30b8\u304c\u6e1b\u5c11\u3057\u307e\u3057\u305f\u3002<\/p>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u624b\u52d5\u3067\u89e3\u6c7a\u3059\u308b\u65b9\u6cd5\u3092\u6bb5\u968e\u7684\u306b\u8aac\u660e\u3057\u3066\u3044\u308b\u57fa\u790e\u52d5\u753b\u3092\u3001\u6700\u65b0\u306e <a href=\"https:\/\/www.youtube.com\/playlist?list=PLDshL1Z581YYxLsjYwM25HkIYrymXb7H_\">Git Power Routines<\/a> \u30b3\u30fc\u30b9\u3067\u3054\u53c2\u7167\u304f\u3060\u3055\u3044\u3002<\/p>\n<p><a href=\"https:\/\/www.youtube.com\/playlist?list=PLDshL1Z581YYxLsjYwM25HkIYrymXb7H_\"><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/power-routines-e1456359671111.png\" alt=\"power-routines\" width=\"600\" height=\"204\" class=\"alignnone size-full wp-image-3512\" \/><\/a><\/p>\n<h2 id=\"parade-of-merge-tools\">\u6570\u3005\u306e\u30de\u30fc\u30b8\u30c4\u30fc\u30eb<\/h2>\n<p>\u8907\u96d1\u306a\u30de\u30fc\u30b8\u3084\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u3092\u3059\u308b\u30d3\u30b8\u30e5\u30a2\u30eb\u30c4\u30fc\u30eb\u304c\u305f\u304f\u3055\u3093\u3042\u308a\u307e\u3059\u3002\u79c1\u306e\u540c\u50da\u305f\u3061\u304c\u5e45\u5e83\u3044\u30c4\u30fc\u30eb\u3092 (\u5b8c\u5168\u306b\u7db2\u7f85\u3057\u3066\u3044\u308b\u308f\u3051\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u304c) \u6319\u3052\u3066\u3044\u307e\u3057\u305f\u3002<\/p>\n<h3 id=\"6-intellij-idea-conflict-resolution-tool\">6. IntelliJ IDEA \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6c7a\u30c4\u30fc\u30eb<\/h3>\n<p>IntelliJ IDEA \u306f\u30a2\u30c8\u30e9\u30b7\u30a2\u30f3\u306e\u591a\u304f\u306e\u793e\u54e1\u304c\u5229\u7528\u3057\u3066\u3044\u308b IDE \u3067\u3059\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u5bfe\u51e6\u3059\u308b\u305f\u3081\u306b\u3001\u591a\u304f\u306e\u4eba\u304c\u30d3\u30eb\u30c8\u30a4\u30f3\u306e IntelliJ IDEA \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6c7a\u30c4\u30fc\u30eb\u3092\u4f7f\u3063\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u30c4\u30fc\u30eb\u306f\u5206\u6790\u7528\u306b\u30ed\u30fc\u30ab\u30eb\u3001\u30ea\u30e2\u30fc\u30c8\u3001\u30de\u30fc\u30b8\u7d50\u679c\u306e 3 \u3064\u306e\u30da\u30a4\u30f3\u3092\u7528\u610f\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/intellij-e1456359785902.png\" alt=\"intellij\" width=\"600\" height=\"329\" class=\"alignnone size-full wp-image-3513\" \/><\/p>\n<h3 id=\"7-kdiff3\">7. KDiff3<\/h3>\n<p><a href=\"http:\/\/kdiff3.sourceforge.net\/\">KDiff3<\/a> \u306f KDE \u30d7\u30ed\u30c0\u30af\u30c8\u30b9\u30a4\u30fc\u30c8\u306e 1 \u3064\u3067\u3001\u5f53\u793e\u5185\u306e\u8abf\u67fb\u3067\u6570\u56de\u8a00\u53ca\u3055\u308c\u307e\u3057\u305f\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/kdiff3-e1456359842745.png\" alt=\"kdiff3\" width=\"600\" height=\"286\" class=\"alignnone size-full wp-image-3514\" \/><\/p>\n<h3 id=\"8-p4merge\">8. P4Merge<\/h3>\n<p><a href=\"https:\/\/www.sourcetreeapp.com\/\">SourceTree<\/a> \u306e\u6700\u521d\u306e\u4f5c\u8005\u30b9\u30c6\u30a3\u30fc\u30d6\u30fb\u30b9\u30c8\u30ea\u30fc\u30c6\u30a3\u30f3\u30b0\u3068\u6570\u540d\u306e\u540c\u50da\u306f P4Merge \u3092\u30de\u30fc\u30b8\u306b\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002<a href=\"https:\/\/www.perforce.com\/product\/components\/perforce-visual-merge-and-diff-tools\">P4Merge<\/a> \u306f\u7121\u6599\u306e\u30d3\u30b8\u30e5\u30a2\u30eb\u30c4\u30fc\u30eb\u3067\u3001\u4ed6\u306e\u30c4\u30fc\u30eb\u306f 3 \u3064\u3067\u3059\u304c\u3053\u306e\u30c4\u30fc\u30eb\u306f 4 \u3064\u306e\u30da\u30a4\u30f3\u3092\u7528\u610f\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u30da\u30a4\u30f3\u304c\u8868\u793a\u3059\u308b\u306e\u306f\u300c\u30d9\u30fc\u30b9\u300d\u300c\u30ed\u30fc\u30ab\u30eb\u300d\u300c\u30ea\u30e2\u30fc\u30c8\u300d\u300c\u30de\u30fc\u30b8\u7d50\u679c\u300d\u3067\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/p4merge.png\" alt=\"p4merge\" width=\"584\" height=\"501\" class=\"alignnone size-full wp-image-3515\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/p4merge.png 584w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/p4merge-300x257.png 300w\" sizes=\"auto, (max-width: 584px) 100vw, 584px\" \/><\/p>\n<h3 id=\"9-meld\">9. meld<\/h3>\n<p><a href=\"http:\/\/meldmerge.org\/\">meld<\/a> \u306fGTK+ \u3068 Python \u3067\u958b\u767a\u3055\u308c\u305f\u30c4\u30fc\u30eb\u3067\u3001\u9577\u3044\u9593\u4f7f\u7528\u3055\u308c\u3066\u3044\u3066\u3001\u6570\u4eba\u304c\u3053\u306e\u30c4\u30fc\u30eb\u3092\u6319\u3052\u307e\u3057\u305f\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/meld-e1456359984658.png\" alt=\"meld\" width=\"600\" height=\"459\" class=\"alignnone size-full wp-image-3516\" \/><\/p>\n<h3 id=\"10-tig-for-status-diff\">10. \u30b9\u30c6\u30fc\u30bf\u30b9\u7528\u306e tig \u3068 diff<\/h3>\n<p>\u30bf\u30fc\u30df\u30ca\u30eb\u304c\u597d\u304d\u306a\u4eba\u305f\u3061\u306f <a href=\"http:\/\/jonas.nitro.dk\/tig\/\">tig<\/a> (\u5f53\u793e\u306f <a href=\"http:\/\/aatljapan.wpengine.com\/2013\/05\/git-tig\/\">\u4ee5\u524d tig \u306b\u95a2\u3059\u308b\u7d20\u6674\u3089\u3057\u3044\u7d39\u4ecb\u8a18\u4e8b<\/a> \u3092\u66f8\u304d\u307e\u3057\u305f) \u3068\u6a19\u6e96\u30bf\u30fc\u30df\u30ca\u30eb\u306e <tt>git diff<\/tt> \u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/tig-e1456360154955.png\" alt=\"tig\" width=\"600\" height=\"371\" class=\"alignnone size-full wp-image-3517\" \/><\/p>\n<h3 id=\"11-os-x-filemerge-aka-opendiff\">11. OS X FileMerge\u3001\u5225\u540d opendiff<\/h3>\n<p>\u591a\u304f\u306e\u63d0\u6848\u306e\u4e2d\u3067\u30012\u30013 \u4eba\u306e\u958b\u767a\u8005\u304c OS X \u306e\u30cd\u30a4\u30c6\u30a3\u30d6\u30c4\u30fc\u30eb\u300c<tt>opendiff<\/tt>\u300d\u3001\u3042\u308b\u3044\u306f\u300cFileMerge\u300d\u3068\u3044\u3046\u30c4\u30fc\u30eb\u3092\u6319\u3052\u307e\u3057\u305f\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/filemerge-e1456360205805.png\" alt=\"filemerge\" width=\"600\" height=\"497\" class=\"alignnone size-full wp-image-3518\" \/><\/p>\n<h3 id=\"12-diffmerge\">12. diffmerge<\/h3>\n<p>\u79c1\u306f <a href=\"https:\/\/sourcegear.com\/diffmerge\/\">diffmerge<\/a> \u306b\u3064\u3044\u3066\u3042\u307e\u308a\u77e5\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u304c\u3001\u3053\u308c\u3082\u63d0\u6848\u306e\u4e2d\u306b\u3042\u308a\u307e\u3057\u305f\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/diffmerge-e1456360332296.png\" alt=\"diffmerge\" width=\"600\" height=\"376\" class=\"alignnone size-full wp-image-3519\" \/><\/p>\n<h3 id=\"13-araxis-merge-commercial-\">13. Araxis Merge (\u5546\u7528)<\/h3>\n<p>\u79c1\u306f\u3053\u306e <a href=\"http:\/\/www.araxis.com\/merge\/index.en\">Araxis Merge<\/a> \u3068\u3044\u3046\u540d\u524d\u3092\u898b\u308b\u3068\u3001\u305a\u3063\u3068\u4ee5\u524d\u306b\u53b3\u91cd\u306a Windows \u30de\u30b7\u30f3\u3067\u4f5c\u696d\u3057\u3066\u3044\u305f\u9803\u3092\u601d\u3044\u51fa\u3057\u307e\u3059\u3002\u5927\u91cf\u306e XML \u30d5\u30a1\u30a4\u30eb\u306e\u4e2d\u3067\u3082\u304c\u304d\u3001\u3053\u306e\u30c4\u30fc\u30eb\u304c\u5f79\u306b\u7acb\u3064\u3053\u3068\u304c\u5206\u304b\u308a\u307e\u3057\u305f\u3002\u3053\u308c\u306f\u5546\u7528\u30c4\u30fc\u30eb\u3067\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/aatljapan.wpengine.com\/files\/araxis-e1456360379274.jpg\" alt=\"araxis\" width=\"600\" height=\"375\" class=\"alignnone size-full wp-image-3520\" \/><\/p>\n<h3 id=\"14-vimdiff3\">14. vimdiff3<\/h3>\n<p>\u6570\u4eba\u306e\u540c\u50da\u304c <a href=\"http:\/\/www.rosipov.com\/blog\/use-vimdiff-as-git-mergetool\/\">vimdiff<\/a> \u3092\u4f7f\u7528\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306f vim \u306e\u30de\u30fc\u30b8 \/ diff \u30c4\u30fc\u30eb\u3067\u3059\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u5165\u529b\u3057\u3066\u8a2d\u5b9a\u3057\u307e\u3059\u3002<\/p>\n<pre><code>git config merge.tool vimdiff\r\ngit config merge.conflictstyle diff3\r\ngit config mergetool.prompt false<\/code><\/pre>\n<p>\u3042\u308b\u3044\u306f <tt>.gitconfig<\/tt> \u30d5\u30a1\u30a4\u30eb\u3092\u4e0a\u8a18\u306e\u3088\u3046\u306b\u76f4\u63a5\u4fee\u6b63\u3057\u307e\u3059\u3002<\/p>\n<h2 id=\"conclusions\">\u307e\u3068\u3081<\/h2>\n<p>\u3042\u306a\u305f\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u3069\u306e\u3088\u3046\u306b\u89e3\u6c7a\u3057\u3066\u3044\u307e\u3059\u304b? \u3053\u3053\u3067\u6319\u3052\u305f\u30c4\u30fc\u30eb\u3068\u306f\u9055\u3046\u30c4\u30fc\u30eb\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u304b? \u3042\u306a\u305f\u306e\u30c6\u30af\u30cb\u30c3\u30af\u3092\u6559\u3048\u3066\u304f\u3060\u3055\u3044\u3002<a href=\"https:\/\/www.twitter.com\/durdn\">@durdn<\/a> \u307e\u305f\u306f\u3001\u5f53\u793e\u306e\u7d20\u6674\u3089\u3057\u3044\u30c1\u30fc\u30e0 <a href=\"https:\/\/www.twitter.com\/atlassiandev\">@atlassiandev<\/a> \u307e\u3067\u3054\u9023\u7d61\u304f\u3060\u3055\u3044\u3002<\/p>\n<p><\/br><br \/>\n<small><br \/>\n*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Developers \u306e\u7ffb\u8a33\u3067\u3059\u3002\u672c\u6587\u4e2d\u306e\u65e5\u6642\u306a\u3069\u306f\u6295\u7a3f\u5f53\u6642\u306e\u3082\u306e\u3067\u3059\u306e\u3067\u3054\u4e86\u627f\u304f\u3060\u3055\u3044\u3002<br \/>\n*\u539f\u6587 : 2015 \u5e74 12 \u6708 1 \u65e5 \"<a href=\"https:\/\/developer.atlassian.com\/blog\/2015\/12\/tips-tools-to-solve-git-conflicts\/\" target=\"_blank\">14 tips and tools to resolve conflicts with Git<\/a>\"<br \/>\n<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git \u306f\u30b3\u30fc\u30c9\u306e\u30de\u30fc\u30b8\u3092\u975e\u5e38\u306b\u5f97\u610f\u3068\u3057\u3066\u3044\u307e\u3059\u3002\u30de\u30fc\u30b8\u3068\u306f\u30ed\u30fc\u30ab\u30eb\u3067\u9ad8\u901f\u3001\u305d\u3057\u3066\u67d4\u8edf\u306b\u884c\u3048\u308b\u3082\u306e\u3067\u3059\u3002\u5f53\u7136\u306e\u3053\u3068\u3067\u3059\u304c\u3001\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u8ab0\u304b\u304c\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u30de\u30fc\u30b8\u3059\u308b\u305f\u3073\u306b\u30b3\u30f3\u30d5&hellip;<\/p>\n","protected":false},"author":275,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[103,645],"coauthors":[],"class_list":["post-3509","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-git","tag-645"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/3509","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/users\/275"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=3509"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/3509\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=3509"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=3509"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=3509"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=3509"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}