{"provider_url":"https://hatena.blog","categories":["git"],"provider_name":"Hatena Blog","published":"2021-06-25 08:01:38","type":"rich","height":"190","description":"\u3053\u306e\u8a18\u4e8b\u306f 2021 \u5e74 06 \u6708 25 \u65e5\u306b\u6295\u7a3f\u3057\u307e\u3057\u305f\u3002 \u76ee\u6b21 \u306f\u3058\u3081\u306b git\u3067merge\u3092\u53d6\u308a\u6d88\u3059 \u304a\u308f\u308a\u306b \u30ea\u30f3\u30af 1. \u306f\u3058\u3081\u306b \u3053\u3093\u306b\u3061\u306f\u3001iOS \u306e\u30a8\u30c7\u30a3\u30bf\u30a2\u30d7\u30eaPWEditor\u306e\u958b\u767a\u8005\u306e\u4e8c\u4fe3\u3067\u3059\u3002 \u4eca\u56de\u306f\u696d\u52d9\u3067\u4f7f\u7528\u3057\u3066\u3044\u308bgit\u3067merge\u3092\u53d6\u308a\u6d88\u3059\u65b9\u6cd5\u306b\u3064\u3044\u3066\u3067\u3059\u3002 \u76ee\u6b21\u3078 2. git\u3067merge\u3092\u53d6\u308a\u6d88\u3059 git\u3067merge\u3092\u53d6\u308a\u6d88\u3059\u65b9\u6cd5\u3067\u3059\u304c\u3001\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002 merge\u5f8c\u3001\u7de8\u96c6\u306a\u3069\u3057\u3066\u306a\u3044\u5834\u5408\u306e\u65b9\u6cd5\u306b\u306a\u308a\u307e\u3059\u3002 git merge --abort \u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 git merge \u53c2\u8003 \u3010git\u3011\u30de\u30fc\u30b8\u3057\u305f\u3051\u3069\u3084\u3063\u3071\u308a\u3084\u3081\u305f\u3044\u6642\u306e\u3084\u308a\u65b94\u7a2e\u985e \u76ee\u6b21\u3078 3\u2026","author_name":"paveway","blog_url":"https://www.paveway.info/","url":"https://www.paveway.info/entry/2021/06/25/git_merge_abort","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.paveway.info%2Fentry%2F2021%2F06%2F25%2Fgit_merge_abort\" title=\"git\u3067merge\u3092\u53d6\u308a\u6d88\u3059 - \u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u66f8\u3053\u3046\uff01\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","version":"1.0","title":"git\u3067merge\u3092\u53d6\u308a\u6d88\u3059","blog_title":"\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u66f8\u3053\u3046\uff01","image_url":"https://cdn.user.blog.st-hatena.com/default_entry_og_image/152787833/1526825363332444","author_url":"https://blog.hatena.ne.jp/paveway/","width":"100%"}