{"id":712,"date":"2019-04-06T00:23:22","date_gmt":"2019-04-06T00:23:22","guid":{"rendered":"https:\/\/thinkcolorful.org\/?p=712"},"modified":"2024-12-13T19:46:41","modified_gmt":"2024-12-13T19:46:41","slug":"mapping-pollutants-part-3-git-and-merging-conflicts","status":"publish","type":"post","link":"https:\/\/thinkcolorful.org\/?p=712","title":{"rendered":"Mapping Pollutants Part 3: Git and merging conflicts"},"content":{"rendered":"\n<p><p>So the last step in this process was getting my code merged, but there were conflicts! I found some helpful guides that walked me through the process that I wanted to note down.  The first was an article called <a href=\"https:\/\/help.github.com\/en\/articles\/resolving-a-merge-conflict-using-the-command-line\">Resolving a merge conflict using the command line<\/a>. This guide was pretty straightforward and provided me with most of that I needed to do.  The step though they don&#8217;t mention is that before you can sync your fork with an upstream repository, you must <a href=\"https:\/\/help.github.com\/en\/articles\/configuring-a-remote-for-a-fork\">configure a remote that points to the upstream repository<\/a> in Git.  Sagarpreet also proveded a link that was helpful called <a href=\"https:\/\/github.com\/AgileVentures\/MetPlus_PETS\/wiki\/Resolving-Pull-Request-merge-conflicts\">Resolving Pull Request merge conflicts.<\/a><\/p><\/p>\n\n\n\n<p><a href=\"https:\/\/github.com\/publiclab\/leaflet-environmental-layers\/pull\/154\">See my merge!<\/a><\/p>\n\n\n\n<p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>So the last step in this process was getting my code merged, but there were conflicts! I found some&#46;&#46;&#46;<\/p>\n","protected":false},"author":2,"featured_media":873,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[214,10],"tags":[],"class_list":["post-712","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-javascript","category-programming"],"_links":{"self":[{"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/posts\/712","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=712"}],"version-history":[{"count":4,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/posts\/712\/revisions"}],"predecessor-version":[{"id":1079,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/posts\/712\/revisions\/1079"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=\/wp\/v2\/media\/873"}],"wp:attachment":[{"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=712"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=712"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/thinkcolorful.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=712"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}