{"id":98325,"date":"2018-03-23T07:00:01","date_gmt":"2018-03-23T21:00:01","guid":{"rendered":"https:\/\/blogs.msdn.microsoft.com\/oldnewthing\/?p=98325"},"modified":"2020-09-24T07:54:56","modified_gmt":"2020-09-24T14:54:56","slug":"20180323-01","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180323-01\/?p=98325","title":{"rendered":"Stop cherry-picking, start merging: Index"},"content":{"rendered":"<p>Here&#8217;s an index to the &#8220;Stop cherry-picking, start merging&#8221; series that just completed, if that&#8217;s the sort of thing you are into:<\/p>\n<ul>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180312-00\/?p=98215\"> Part 1: The merge conflict<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180313-00\/?p=98225\"> Part 2: The merge conflict that never happened (but should have)<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180314-00\/?p=98235\"> Part 3: Avoiding problems by creating a new merge base<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180315-00\/?p=98245\"> Part 4: Exploiting the recursive merge algorithm<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180316-00\/?p=98255\"> Part 5: Exploiting the three-way merge<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180319-00\/?p=98265\"> Part 6: Replacing the temporary fix with the permanent fix<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180320-00\/?p=98275\"> Part 7: Preventing a change from leaving a branch<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180321-00\/?p=98285\"> Part 8: How to merge a partial cherry-pick<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180322-00\/?p=98295\"> Part 9: Chasing the commit<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180323-00\/?p=98315\"> Part 10: Web-based workflow for VSTS<\/a><\/li>\n<li><a href=\"https:\/\/devblogs.microsoft.com\/oldnewthing\/20180709-00\/?p=99195\"> Stop merging if you need to cherry-pick<\/a>: A response from the VSTS team.<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>For one-stop reading.<\/p>\n","protected":false},"author":1069,"featured_media":111744,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[1],"tags":[26],"class_list":["post-98325","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-oldnewthing","tag-other"],"acf":[],"blog_post_summary":"<p>For one-stop reading.<\/p>\n","_links":{"self":[{"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/posts\/98325","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/users\/1069"}],"replies":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/comments?post=98325"}],"version-history":[{"count":0,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/posts\/98325\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/media\/111744"}],"wp:attachment":[{"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/media?parent=98325"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/categories?post=98325"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/oldnewthing\/wp-json\/wp\/v2\/tags?post=98325"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}