{"id":5233,"date":"2018-08-22T13:51:49","date_gmt":"2018-08-22T13:51:49","guid":{"rendered":"http:\/\/www.scmgalaxy.com\/tutorials\/?p=5233"},"modified":"2021-11-17T10:15:54","modified_gmt":"2021-11-17T10:15:54","slug":"best-branching-and-merging-strategies-in-git","status":"publish","type":"post","link":"https:\/\/www.devopsschool.com\/blog\/best-branching-and-merging-strategies-in-git\/","title":{"rendered":"Best Branching and Merging strategies in git"},"content":{"rendered":"<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-5275\" src=\"http:\/\/www.scmgalaxy.com\/tutorials\/wp-content\/uploads\/2018\/08\/git.png\" alt=\"\" width=\"600\" height=\"350\" srcset=\"https:\/\/www.devopsschool.com\/blog\/wp-content\/uploads\/2018\/08\/git.png 600w, https:\/\/www.devopsschool.com\/blog\/wp-content\/uploads\/2018\/08\/git-300x175.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/p>\n<p><strong>Best Branching and Merging strategies in git<\/strong><\/p>\n<p><strong>Step 1 &#8211; First you need to learn the needs of branches. This is very good read.<\/strong><\/p>\n<ul>\n<li>https:\/\/docs.microsoft.com\/en-us\/vsts\/repos\/tfvc\/branching-strategies-with-tfvc?view=vsts<\/li>\n<\/ul>\n<p><strong>Step 2 &#8211; Now time has come to Learn best branching model in Git.<\/strong><\/p>\n<ul>\n<li>https:\/\/buddy.works\/blog\/5-types-of-git-workflows<\/li>\n<li>https:\/\/hackernoon.com\/a-branching-and-releasing-strategy-that-fits-github-flow-be1b6c48eca2<\/li>\n<li>https:\/\/nvie.com\/posts\/a-successful-git-branching-model\/<\/li>\n<\/ul>\n<p><strong>Step 3 &#8211; Now, Lets understand, what is the kind of merges we have in Git?<\/strong><\/p>\n<ul>\n<li>https:\/\/www.atlassian.com\/git\/tutorials\/using-branches\/git-merge<\/li>\n<li>https:\/\/git-scm.com\/docs\/merge-strategies<\/li>\n<li>https:\/\/stackoverflow.com\/questions\/366860\/when-would-you-use-the-different-git-merge-strategies<\/li>\n<\/ul>\n<p><strong>Step 4 &#8211; Are you still having a questions, Please post in the comment section.<\/strong><\/p>\n\n<div class=\"epyt-gallery\" data-currpage=\"1\" id=\"epyt_gallery_20373\"><figure class=\"wp-block-embed wp-block-embed-youtube is-type-video is-provider-youtube epyt-figure\"><div class=\"wp-block-embed__wrapper\"><iframe loading=\"lazy\"  id=\"_ytid_96396\"  width=\"760\" height=\"427\"  data-origwidth=\"760\" data-origheight=\"427\" src=\"https:\/\/www.youtube.com\/embed\/?enablejsapi=1&#038;autoplay=0&#038;cc_load_policy=0&#038;cc_lang_pref=&#038;iv_load_policy=1&#038;loop=0&#038;rel=1&#038;fs=1&#038;playsinline=0&#038;autohide=2&#038;theme=dark&#038;color=red&#038;controls=1&#038;disablekb=0&#038;\" class=\"__youtube_prefs__  no-lazyload\" title=\"YouTube player\"  data-epytgalleryid=\"epyt_gallery_20373\"  allow=\"fullscreen; accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share\" referrerpolicy=\"strict-origin-when-cross-origin\" allowfullscreen data-no-lazy=\"1\" data-skipgform_ajax_framebjll=\"\"><\/iframe><\/div><\/figure><div class=\"epyt-gallery-list\"><div>Sorry, there was a YouTube error.<\/div><\/div><\/div>","protected":false},"excerpt":{"rendered":"<p>Best Branching and Merging strategies in git Step 1 &#8211; First you need to learn the needs of branches. This is very good read. https:\/\/docs.microsoft.com\/en-us\/vsts\/repos\/tfvc\/branching-strategies-with-tfvc?view=vsts Step 2 &#8211; Now time has come to Learn best branching model in Git. https:\/\/buddy.works\/blog\/5-types-of-git-workflows https:\/\/hackernoon.com\/a-branching-and-releasing-strategy-that-fits-github-flow-be1b6c48eca2 https:\/\/nvie.com\/posts\/a-successful-git-branching-model\/ Step 3 &#8211; Now, Lets understand, what is the kind of merges we&#8230;<\/p>\n","protected":false},"author":1,"featured_media":5275,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_kad_post_transparent":"","_kad_post_title":"","_kad_post_layout":"","_kad_post_sidebar_id":"","_kad_post_content_style":"","_kad_post_vertical_padding":"","_kad_post_feature":"","_kad_post_feature_position":"","_kad_post_header":false,"_kad_post_footer":false,"_kad_post_classname":"","_joinchat":[],"footnotes":""},"categories":[38],"tags":[647,390,2213,945,160,2718,2214,5030],"class_list":["post-5233","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-git","tag-best","tag-branch","tag-branching","tag-gerrit","tag-git","tag-merge","tag-merging","tag-strategies"],"_links":{"self":[{"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/posts\/5233","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/comments?post=5233"}],"version-history":[{"count":3,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/posts\/5233\/revisions"}],"predecessor-version":[{"id":25588,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/posts\/5233\/revisions\/25588"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/media\/5275"}],"wp:attachment":[{"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/media?parent=5233"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/categories?post=5233"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.devopsschool.com\/blog\/wp-json\/wp\/v2\/tags?post=5233"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}