{"id":1645,"date":"2016-06-08T18:14:54","date_gmt":"2016-06-08T09:14:54","guid":{"rendered":"https:\/\/learningbox.co.jp\/?p=1645"},"modified":"2018-09-17T22:23:50","modified_gmt":"2018-09-17T13:23:50","slug":"svn-%e3%83%9e%e3%83%bc%e3%82%b8%e3%81%a7%e3%82%b3%e3%83%b3%e3%83%95%e3%83%aa%e3%82%af%e3%83%88%e3%81%97%e3%81%9f%e6%99%82%e3%81%ae%e7%9b%b4%e3%81%97%e6%96%b9","status":"publish","type":"post","link":"https:\/\/learningbox.co.jp\/en\/2016\/06\/08\/svn-%e3%83%9e%e3%83%bc%e3%82%b8%e3%81%a7%e3%82%b3%e3%83%b3%e3%83%95%e3%83%aa%e3%82%af%e3%83%88%e3%81%97%e3%81%9f%e6%99%82%e3%81%ae%e7%9b%b4%e3%81%97%e6%96%b9\/","title":{"rendered":"How to fix conflicts in SVN merging"},"content":{"rendered":"<p>If you have a conflict after merging, don't be in a hurry, just edit with e(edit) and accept the change with r(resolved) if it is resolved.<\/p>\n<h4>About options in case of conflicts<\/h4>\n<blockquote>\n<ul>\n<li> (p) postpone <\/li>\n<li class='list-none'> Mark the conflict to be resolved later.<\/li>\n<li>(df) diff-full <\/li>\n<li class='list-none'> Show differences between base revision and conflict files in a unified diff format. <\/li>\n<li>(e) edit <\/li>\n<li class='list-none'> Modify the merged file with the editor. <\/li>\n<li>(r) resolved <\/li>\n<li class='list-none'> Accept the merged version of the file. <\/li>\n<li>(mf) mine-full <\/li>\n<li class='list-none'> Accept the user's entire file and ignore the latest changes in the repository. <\/li>\n<li>(tf) theirs-full <\/li>\n<li class='list-none'> Accept the entire file on the side that conflicts with the user and ignore the latest changes in the local working copy. <\/li>\n<li>(l) launch <\/li>\n<li class='list-none'> Launch an external tool for conflict resolution (this requires the external tool to be configured ahead of time). <\/li>\n<li>(h) help <\/li>\n<li class='list-none'> Lists the options described here. <\/li>\n<\/blockquote>\n<h3>Useful reference URLs for merging<\/h3>\n<ul>\n<li>How to specify a revision<\/li>\n<li class='list-none'>\n<a href='http:\/\/heppoen.seesaa.net\/article\/131019255.html'>http:\/\/heppoen.seesaa.net\/article\/131019255.html<\/a>\n<\/li>\n<li>About the basic merging process<\/li>\n<li class='list-none'>\n<a href='http:\/\/cockatiel-cage.hateblo.jp\/entry\/2012\/12\/14\/122449'>http:\/\/cockatiel-cage.hateblo.jp\/entry\/2012\/12\/14\/122449<\/a>\n<\/li>\n<li> About basic commands <\/li>\n<li class='list-none'>\n<a href='http:\/\/qiita.com\/konweb\/items\/6effd36aab551b2d6b8f'>http:\/\/qiita.com\/konweb\/items\/6effd36aab551b2d6b8f<\/a>\n<\/li>\n<\/ul>","protected":false},"excerpt":{"rendered":"\u30de\u30fc\u30b8\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642\u306f\u3068\u308a\u3042\u3048\u305a\u7126\u3089\u305a\u306b e(edit) \u3067\u7de8\u96c6\u3057\u3066\u89e3\u6c7a\u3057\u305f\u5834\u5408 r(resolved [&hellip;]","protected":false},"author":1,"featured_media":2487,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"inline_featured_image":false,"advanced_seo_description":"","jetpack_seo_html_title":"","jetpack_seo_noindex":false,"vkexunit_cta_each_option":"","footnotes":""},"categories":[6,7],"tags":[],"class_list":["post-1645","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-blog","category-7"],"acf":[],"jetpack_featured_media_url":"https:\/\/learningbox.co.jp\/wp-content\/uploads\/2018\/09\/program_1537190624.jpg","jetpack_shortlink":"https:\/\/wp.me\/pgMrZ4-qx","_links":{"self":[{"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/posts\/1645","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/comments?post=1645"}],"version-history":[{"count":1,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/posts\/1645\/revisions"}],"predecessor-version":[{"id":2488,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/posts\/1645\/revisions\/2488"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/media\/2487"}],"wp:attachment":[{"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/media?parent=1645"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/categories?post=1645"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/learningbox.co.jp\/en\/wp-json\/wp\/v2\/tags?post=1645"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}