{"id":278,"date":"2011-03-07T18:42:26","date_gmt":"2011-03-07T17:42:26","guid":{"rendered":"http:\/\/locallost.net\/?p=278"},"modified":"2011-03-09T23:15:08","modified_gmt":"2011-03-09T22:15:08","slug":"resolve-git-merge-conflicts-on-binary-files","status":"publish","type":"post","link":"https:\/\/locallost.net\/?p=278","title":{"rendered":"Resolve GIT merge conflicts on binary files"},"content":{"rendered":"

To resolve conflits on binary files, you can checkout the remote version and your version with the `–theirs’ and `–ours’ checkout flags. This allows you to inspect both version, then write back the correct resulting file.<\/p>\n

$ git checkout --theirs -- doc\/manual.odt\r\n$ mv doc\/manual.odt doc\/theirs.manual.odt\r\n\r\n$ git checkout --ours -- doc\/manual.odt\r\n$ mv doc\/manual.odt doc\/ours.manual.odt<\/pre>\n
Open and compare `theirs.manual.odt’ with `ours.manual.odt’, and save back the result into `manual.odt’.<\/p>\n
$ git add doc\/manual.odt\r\n$ git commit<\/pre>\n","protected":false},"excerpt":{"rendered":"
To resolve conflits on binary files, you can checkout the remote version and your version with the `–theirs’ and `–ours’ checkout flags. This allows you to inspect both version, then write back the correct resulting file. $ git checkout –theirs … Continuer la lecture →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[4],"tags":[],"class_list":["post-278","post","type-post","status-publish","format-standard","hentry","category-code"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_shortlink":"https:\/\/wp.me\/p2Bei9-4u","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/posts\/278","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/locallost.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=278"}],"version-history":[{"count":15,"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/posts\/278\/revisions"}],"predecessor-version":[{"id":296,"href":"https:\/\/locallost.net\/index.php?rest_route=\/wp\/v2\/posts\/278\/revisions\/296"}],"wp:attachment":[{"href":"https:\/\/locallost.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=278"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/locallost.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=278"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/locallost.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=278"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}