{"id":124,"date":"2026-02-17T19:15:48","date_gmt":"2026-02-17T19:15:48","guid":{"rendered":"https:\/\/charliestelling.co.uk\/?p=124"},"modified":"2026-02-17T19:15:48","modified_gmt":"2026-02-17T19:15:48","slug":"git-standoff","status":"publish","type":"post","link":"https:\/\/charliestelling.co.uk\/?p=124","title":{"rendered":"Git Standoff"},"content":{"rendered":"\n<p>If your local changes would be overwritted by a merge this is how you handle it. <\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>Stash Your Changes, This moves your edits into a tempoary storage area. <em>git stash<\/em><\/li>\n\n\n\n<li>Pull the update. <em>git pull<\/em><\/li>\n\n\n\n<li>pop the stash, this reapplies yoru chnages on to of the new code. <em>git stash pop<\/em> <\/li>\n<\/ul>\n\n\n\n<p>If you dont care about your local changes <br><em>Git reset &#8212; hard origin\/main<\/em><\/p>\n\n\n\n<p>Commit the local change <br><em>git add deploy.sh <br>git commit -m &#8220;local updates to deply&#8221;<\/em><br><\/p>\n\n\n\n<p>Pull the rest. <em>git pull<\/em><\/p>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>If your local changes would be overwritted by a merge this is how you handle it. If you dont care about your local changes Git reset &#8212; hard origin\/main Commit the local change git add deploy.sh git commit -m &#8220;local updates to deply&#8221; Pull the rest. git pull<\/p>\n","protected":false},"author":1,"featured_media":126,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-124","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/posts\/124","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=124"}],"version-history":[{"count":1,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/posts\/124\/revisions"}],"predecessor-version":[{"id":127,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/posts\/124\/revisions\/127"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=\/wp\/v2\/media\/126"}],"wp:attachment":[{"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=124"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=124"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/charliestelling.co.uk\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=124"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}