{"id":4491,"date":"2020-09-08T19:48:33","date_gmt":"2020-09-08T20:18:33","guid":{"rendered":"https:\/\/ultering.com\/it4us\/?p=4491"},"modified":"2021-01-21T15:29:39","modified_gmt":"2021-01-21T15:59:39","slug":"git-solving-conflicts-preserving-my-files-an-easy-way-without-merging","status":"publish","type":"post","link":"https:\/\/ultering.com\/it4us\/?p=4491","title":{"rendered":"GIT: Solving conflicts preserving my files – An easy way without merging"},"content":{"rendered":"

>PROBLEM<\/h3>\n

You’ve made a pull and you got conflicts.<\/p>\n

>SOLUTION<\/h3>\n

An easy alternative without having to merge files.<\/p>\n

    \n
  1. Take note of those files that has conflict issues.<\/li>\n
  2. Move the conflicting files to a temporary folder.<\/li>\n
  3. Commit again.
    \ngit commit -am “solving merge conflicts preserving mine”<\/li>\n
  4. Reset the state to the previous one, before the pull command.
    \ngit reset –hard HEAD<\/li>\n
  5. Perform pull again:
    \ngit pull<\/li>\n
  6. Move back the files from the temporary folder to the project folder.<\/li>\n
  7. Commit again:
    \ngit commit -am “solved merge conflicts preserving mine”<\/li>\n
  8. Push to remote:
    \ngit push<\/li>\n<\/ol>\n

     <\/p>\n

    <\/h2>\n\n
    <\/div>","protected":false},"excerpt":{"rendered":"

    >PROBLEM You’ve made a pull and you got conflicts. >SOLUTION An easy alternative without having to merge files. Take note of those files that has conflict issues. Move the conflicting files to a temporary folder. Commit again. git commit -am “solving merge conflicts preserving mine” Reset the state to the previous one, before the pull … Read More “GIT: Solving conflicts preserving my files – An easy way without merging”<\/span> »<\/a><\/p>\n","protected":false},"author":4,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_bbp_topic_count":0,"_bbp_reply_count":0,"_bbp_total_topic_count":0,"_bbp_total_reply_count":0,"_bbp_voice_count":0,"_bbp_anonymous_reply_count":0,"_bbp_topic_count_hidden":0,"_bbp_reply_count_hidden":0,"_bbp_forum_subforum_count":0,"footnotes":""},"categories":[35],"tags":[],"class_list":["post-4491","post","type-post","status-publish","format-standard","hentry","category-versioning"],"_links":{"self":[{"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/posts\/4491","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/users\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4491"}],"version-history":[{"count":1,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/posts\/4491\/revisions"}],"predecessor-version":[{"id":4494,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=\/wp\/v2\/posts\/4491\/revisions\/4494"}],"wp:attachment":[{"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4491"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4491"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/ultering.com\/it4us\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4491"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}