{"id":22853,"date":"2021-01-16T18:14:31","date_gmt":"2021-01-17T02:14:31","guid":{"rendered":"https:\/\/www.podfeet.com\/blog\/?p=22853"},"modified":"2021-01-16T18:14:31","modified_gmt":"2021-01-17T02:14:31","slug":"ccatp-668","status":"publish","type":"post","link":"https:\/\/www.podfeet.com\/blog\/2021\/01\/ccatp-668\/","title":{"rendered":"CCATP #668 \u2013 Bart Busschots on PBS 110 of X \u2013 Merge Conflicts"},"content":{"rendered":"

In this installment of Programming By Stealth Bart teaches us how to deal with conflicts in branches of our code. He has been purposely only changing one thing at a time before now, but it’s time to face the reality of when two branches change the same line in the same file. I’ve been terrified of this topic for a long time, but Bart shows us how easy it is to see exactly what the conflict is, how you can back out of merging if you make “a pig’s breakfast” of it, and how to resolve your conflicts without fear. It’s not nearly as terrifying as I thought it would be.<\/p>\n

You can find Bart’s tutorial show notes at pbs.bartificer.net\/…<\/a><\/p>\n

And if you learn a lot from Bart, please consider becoming a patron of his by going to www.patreon.com\/…<\/a><\/p>\nhttps:\/\/media.blubrry.com\/nosillacast\/traffic.libsyn.com\/nosillacast\/CCATP_2021_01_16.mp3<\/a><\/audio>\n

mp3 download<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"

In this installment of Programming By Stealth Bart teaches us how to deal with conflicts in branches of our code. He has been purposely only changing one thing at a time before now, but it’s time to face the reality of when two branches change the same line in the same file. I’ve been terrified […]<\/p>\n","protected":false},"author":1,"featured_media":21669,"comment_status":"open","ping_status":"closed","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":""},"categories":[147,172,1,213],"tags":[4457,2064,4456,4307],"class_list":["post-22853","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-blog-posts","category-ccatp","category-podcasts","category-programming-by-stealth","tag-conflict-resolution","tag-git","tag-merge-conflicts","tag-version-control"],"jetpack_featured_media_url":"https:\/\/www.podfeet.com\/blog\/wp-content\/uploads\/2020\/08\/PBS_logo-with-mask.png","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts\/22853","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/comments?post=22853"}],"version-history":[{"count":2,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts\/22853\/revisions"}],"predecessor-version":[{"id":22855,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts\/22853\/revisions\/22855"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/media\/21669"}],"wp:attachment":[{"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/media?parent=22853"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/categories?post=22853"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/tags?post=22853"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}