{"id":1917,"date":"2016-09-30T08:00:00","date_gmt":"2016-09-29T23:00:00","guid":{"rendered":"https:\/\/ecpplus.net\/weblog\/?p=1917"},"modified":"2020-06-06T19:20:09","modified_gmt":"2020-06-06T10:20:09","slug":"xcodeproj-%e3%82%92-conflict-%e3%81%97%e3%81%a5%e3%82%89%e3%81%8f%e3%81%99%e3%82%8b-mergepbx","status":"publish","type":"post","link":"https:\/\/ecpplus.net\/weblog\/xcodeproj-%e3%82%92-conflict-%e3%81%97%e3%81%a5%e3%82%89%e3%81%8f%e3%81%99%e3%82%8b-mergepbx\/","title":{"rendered":"xcodeproj \u3092 CONFLICT \u3057\u3065\u3089\u304f\u3059\u308b mergepbx"},"content":{"rendered":"<p>Xcode \u3092\u4f7f\u3063\u3066\u958b\u767a\u3057\u3066\u3044\u308b\u3068\u3001<code>.xcodeproj<\/code> \u304c\u3001\u8ad6\u7406\u7684\u306b\u306f CONFLICT \u3057\u3066\u3044\u306a\u3044\u306e\u306b Xcode\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u30a2\u30c3\u30d7\u7b49\u3067\u6fc0\u3057\u304f CONFLICT \u3059\u308b\u3053\u3068\u304c\u3042\u308b\u3002 mergepbx \u3092\u4f7f\u3046\u3068\u3001\u7406\u4e0d\u5c3d\u306b CONFLICT \u3055\u308c\u308b\u30b1\u30fc\u30b9\u3092\u3042\u308b\u7a0b\u5ea6\u89e3\u6d88\u3057\u3066\u304f\u308c\u308b\u3002\u8907\u6570\u4eba\u3067\u958b\u767a\u3057\u3066\u3044\u308b\u6642\u306f\u5165\u308c\u3066\u304a\u3044\u3066\u52a9\u304b\u308b\u3053\u3068\u304c\u591a\u3044\u3002<\/p>\n<p>1\u5e74\u304f\u3089\u3044\u4f7f\u3063\u3066\u308b\u3051\u3069\u3001\u7279\u306b\u554f\u984c\u304c\u8d77\u304d\u305f\u3053\u3068\u306f\u306a\u3044\u3067\u3059 \ud83d\ude42<\/p>\n<h2>Install<\/h2>\n<pre><code class=\"line-numbers\">brew install mergepbx\n<\/code><\/pre>\n<h2>Usage<\/h2>\n<p>\u4ee5\u4e0b\u306e2\u30d5\u30a1\u30a4\u30eb\u306b\u8a2d\u5b9a\u3092\u8ffd\u8a18(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5358\u4f4d\u3067\u3082global\u3067\u3082OK)\u3059\u308c\u3070\u3001\u3042\u3068\u306f git merge \u3084 git rebase \u3068\u304b\u901a\u5e38\u306e\u64cd\u4f5c\u3067 <code>mergepbx<\/code> \u3092\u4f7f\u3063\u3066\u304f\u308c\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<h3>.gitconfig<\/h3>\n<p>\u4e0b\u8a18\u3092\u8ffd\u52a0\u3002<\/p>\n<pre><code class=\"line-numbers\">[merge \"mergepbx\"]\n  name = Xcode project files merger\n  driver = mergepbx %O %A %B\n<\/code><\/pre>\n<h3>.gitattributes<\/h3>\n<p>\u4e0b\u8a18\u3092\u8ffd\u52a0\u3002<\/p>\n<pre><code class=\"line-numbers\">*.pbxproj merge=mergepbx\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>Xcode \u3092\u4f7f\u3063\u3066\u958b\u767a\u3057\u3066\u3044\u308b\u3068\u3001.xcodeproj \u304c\u3001\u8ad6\u7406\u7684\u306b\u306f CONFLICT \u3057\u3066\u3044\u306a\u3044\u306e\u306b Xcode\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u30a2\u30c3\u30d7\u7b49\u3067\u6fc0\u3057\u304f CONFLICT \u3059\u308b\u3053\u3068\u304c\u3042\u308b\u3002 mergepbx \u3092\u4f7f\u3046\u3068\u3001\u7406\u4e0d\u5c3d\u306b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":2293,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[43],"tags":[35,12],"class_list":["post-1917","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-development","tag-ios","tag-mac"],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/posts\/1917","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/comments?post=1917"}],"version-history":[{"count":5,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/posts\/1917\/revisions"}],"predecessor-version":[{"id":2299,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/posts\/1917\/revisions\/2299"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/media\/2293"}],"wp:attachment":[{"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/media?parent=1917"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/categories?post=1917"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/ecpplus.net\/weblog\/wp-json\/wp\/v2\/tags?post=1917"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}