{"id":22520,"date":"2020-12-18T10:49:28","date_gmt":"2020-12-18T18:49:28","guid":{"rendered":"https:\/\/www.podfeet.com\/blog\/?p=22520"},"modified":"2020-12-18T10:49:28","modified_gmt":"2020-12-18T18:49:28","slug":"ccatp-665","status":"publish","type":"post","link":"https:\/\/www.podfeet.com\/blog\/2020\/12\/ccatp-665\/","title":{"rendered":"CCATP #665 \u2013 Bart Busschots on PBS 108 of X \u2014 Merging &#038; Tagging"},"content":{"rendered":"<p>In this installment of Programming By Stealth, Bart Busschots continues on his series within a series explaining the version control system Git.  We advance in our branching strategy by working several commits on our dev branch and then learn to use a merge commit to bring only the final commit into the main branch, leaving the half-working intermediate commits to exist only on the dev branch.  This process illustrates the need to learn about tags, both light-weight and annotated.  Once we understand how these tags work and their importance, we evolve our PBS branching strategy one step further.<\/p>\n<p>Bart&#8217;s tutorial shownotes are available at <a href=\"https:\/\/pbs.bartificer.net\/pbs108\" target=\"%5Fblank\" rel=\"noopener\">pbs.bartificer.net\/&#8230;<\/a><\/p>\n<audio class=\"wp-audio-shortcode\" id=\"audio-22520-1\" preload=\"none\" style=\"width: 100%;\" controls=\"controls\"><source type=\"audio\/mpeg\" src=\"https:\/\/media.blubrry.com\/nosillacast\/traffic.libsyn.com\/nosillacast\/CCATP_2020_12_13.mp3?_=1\" \/><a href=\"https:\/\/media.blubrry.com\/nosillacast\/traffic.libsyn.com\/nosillacast\/CCATP_2020_12_13.mp3\">https:\/\/media.blubrry.com\/nosillacast\/traffic.libsyn.com\/nosillacast\/CCATP_2020_12_13.mp3<\/a><\/audio>\n<p><a title=\"mp3 download\" href=\"https:\/\/media.blubrry.com\/nosillacast\/traffic.libsyn.com\/nosillacast\/CCATP_2020_12_13.mp3\" target=\"_blank\" rel=\"noopener noreferrer\">mp3 download<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>In this installment of Programming By Stealth, Bart Busschots continues on his series within a series explaining the version control system Git. We advance in our branching strategy by working several commits on our dev branch and then learn to use a merge commit to bring only the final commit into the main branch, leaving [&hellip;]<\/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":[4401,2064,176,240,241],"class_list":["post-22520","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-blog-posts","category-ccatp","category-podcasts","category-programming-by-stealth","tag-branching","tag-git","tag-programming","tag-programming-by-stealth","tag-tags"],"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\/22520","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=22520"}],"version-history":[{"count":2,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts\/22520\/revisions"}],"predecessor-version":[{"id":22522,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/posts\/22520\/revisions\/22522"}],"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=22520"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/categories?post=22520"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.podfeet.com\/blog\/wp-json\/wp\/v2\/tags?post=22520"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}