{"id":4331,"date":"2026-03-28T16:42:11","date_gmt":"2026-03-28T11:12:11","guid":{"rendered":"https:\/\/codematrix.co.in\/blog\/?page_id=4331"},"modified":"2026-03-30T15:36:59","modified_gmt":"2026-03-30T10:06:59","slug":"branching-merging","status":"publish","type":"page","link":"https:\/\/codematrix.co.in\/blog\/branching-merging\/","title":{"rendered":"Branching &amp; Merging"},"content":{"rendered":"\t\t<div data-elementor-type=\"wp-page\" data-elementor-id=\"4331\" class=\"elementor elementor-4331\">\n\t\t\t\t<div class=\"elementor-element elementor-element-06c943b e-flex e-con-boxed e-con e-parent\" data-id=\"06c943b\" data-element_type=\"container\" data-e-type=\"container\">\n\t\t\t\t\t<div class=\"e-con-inner\">\n\t\t\t\t<div class=\"elementor-element elementor-element-e0774b8 elementor-widget elementor-widget-html\" data-id=\"e0774b8\" data-element_type=\"widget\" data-e-type=\"widget\" data-widget_type=\"html.default\">\n\t\t\t\t\t<style>\r\n    \/* --- Brand Styling --- *\/\r\n    :root {\r\n        --brand-purple: #9C00E4;\r\n        --brand-light: #f3e8ff;\r\n    }\r\n\r\n    \/* Reset & Base *\/\r\n    .python-full-layout * { box-sizing: border-box; }\r\n\r\n    \/* Layout Adjustments *\/\r\n    .python-full-layout { \r\n        display: flex; \r\n        gap: 30px; \r\n        padding: 20px; \r\n        max-width: 1200px; \r\n        margin: 0 auto;\r\n        background: #fdfbff; \r\n    }\r\n\r\n    .sidebar { \r\n        width: 280px; \r\n        position: sticky; \r\n        top: 20px; \r\n        height: fit-content; \r\n        flex-shrink: 0;\r\n    }\r\n\r\n    .sidebar .topic { \r\n        display: block; \r\n        padding: 12px; \r\n        text-decoration: none; \r\n        color: #444; \r\n        border-radius: 8px; \r\n        margin-bottom: 8px; \r\n        background: #fff;\r\n        border: 1px solid #eee;\r\n        transition: 0.3s;\r\n    }\r\n\r\n    .sidebar .topic.active { \r\n        background: var(--brand-purple); \r\n        color: white; \r\n        border-color: var(--brand-purple);\r\n    }\r\n\r\n    \/* Main Content *\/\r\n    .main-content { \r\n        flex: 1; \r\n        font-family: 'Segoe UI', sans-serif; \r\n        min-width: 0; \r\n    }\r\n\r\n    .article-card { \r\n        background: white; \r\n        padding: 30px; \r\n        border-radius: 15px; \r\n        box-shadow: 0 4px 15px rgba(0,0,0,0.05); \r\n    }\r\n\r\n    h1 { color: var(--brand-purple); font-size: 2.2rem; margin-bottom: 20px; }\r\n    h2 { color: #333; margin-top: 30px; border-left: 4px solid var(--brand-purple); padding-left: 15px; }\r\n    \r\n    .custom-img { \r\n        display: block; \r\n        margin: 30px auto; \r\n        width: 100%; \r\n        max-width: 600px; \r\n        border: 2px solid #e9d5ff; \r\n        border-radius: 10px;\r\n    }\r\n\r\n    table { \r\n        width: 100%; \r\n        border-collapse: collapse; \r\n        margin: 20px 0; \r\n    }\r\n\r\n    table th, table td { \r\n        border: 1px solid #eee; \r\n        padding: 12px; \r\n        text-align: left; \r\n    }\r\n\r\n    table th { background: #f8f9fa; color: var(--brand-purple); }\r\n\r\n    \/* Responsive *\/\r\n    @media (max-width: 991px) {\r\n        .python-full-layout { flex-direction: column; }\r\n        .sidebar { width: 100%; position: relative; top: 0; }\r\n    }\r\n<\/style>\r\n\r\n<div class=\"python-full-layout\">\r\n    <aside class=\"sidebar\">\r\n        <h2 style=\"font-size: 1.2rem; color: var(--brand-purple); margin-bottom: 15px;\">Git Workflow<\/h2>\r\n        <a href=\"#branching\" class=\"topic active\">1. Branching<\/a>\r\n        <a href=\"#merging\" class=\"topic\">2. Merging<\/a>\r\n        <a href=\"#conflicts\" class=\"topic\">3. Merge Conflicts<\/a>\r\n        <a href=\"#commands\" class=\"topic\">4. Common Commands<\/a>\r\n        <a href=\"#mcq\" class=\"topic\">Practice MCQs<\/a>\r\n    <\/aside>\r\n\r\n    <main class=\"main-content\">\r\n        <article class=\"article-card\">\r\n            \r\n            <header id=\"branching\">\r\n                <h1>Branching & Merging<\/h1>\r\n                <p>In version control (like Git), <strong>Branching<\/strong> allows you to diverge from the main line of development and continue to work without affecting that main line. <strong>Merging<\/strong> is the process of putting those changes back together.<\/p>\r\n            <\/header>\r\n\r\n            <img decoding=\"async\" src=\"https:\/\/codematrix.co.in\/blog\/wp-content\/uploads\/2026\/03\/1_Zk6GM_uDQAUbdYtHPpZjZw.png\" alt=\"Branching & Merging\" class=\"custom-img\">\r\n\r\n            <section id=\"branching-detail\">\r\n                <h2>1. What is Branching?<\/h2>\r\n                <p>Think of a branch as a separate workspace. When you want to add a new feature or fix a bug, you create a branch. This ensures the <strong>main<\/strong> (or master) branch always contains stable, working code.<\/p>\r\n                <ul>\r\n                    <li><strong>Isolation:<\/strong> Developers can work on different features simultaneously.<\/li>\r\n                    <li><strong>Safety:<\/strong> Experimental code won't break the production environment.<\/li>\r\n                <\/ul>\r\n            <\/section>\r\n\r\n            <section id=\"merging\">\r\n                <h2>2. What is Merging?<\/h2>\r\n                <p>Once your work on a branch is complete and tested, you \"merge\" it back into the main branch. Git looks at the history of both branches and combines the changes.<\/p>\r\n                <ul>\r\n                    <li><strong>Fast-forward Merge:<\/strong> Occurs when the main branch hasn't changed since you branched off.<\/li>\r\n                    <li><strong>Three-way Merge:<\/strong> Occurs when both branches have new, different commits.<\/li>\r\n                <\/ul>\r\n            <\/section>\r\n\r\n\r\n            <section id=\"conflicts\">\r\n                <h2>3. Merge Conflicts<\/h2>\r\n                <p>A conflict happens when two branches have different changes to the <strong>same line<\/strong> of the <strong>same file<\/strong>. Git won't know which version to keep and will ask you to decide manually.<\/p>\r\n            <\/section>\r\n\r\n            <section id=\"commands\">\r\n                <h2>4. Essential Git Commands<\/h2>\r\n                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>Action<\/th>\r\n                            <th>Command<\/th>\r\n                        <\/tr>\r\n                    <\/thead>\r\n                    <tbody>\r\n                        <tr><td>Create a new branch<\/td><td><code>git branch feature-name<\/code><\/td><\/tr>\r\n                        <tr><td>Switch to a branch<\/td><td><code>git checkout feature-name<\/code><\/td><\/tr>\r\n                        <tr><td>Merge into current branch<\/td><td><code>git merge feature-name<\/code><\/td><\/tr>\r\n                        <tr><td>Delete a branch<\/td><td><code>git branch -d feature-name<\/code><\/td><\/tr>\r\n                    <\/tbody>\r\n                <\/table>\r\n            <\/section>\r\n\r\n            <section id=\"mcq\" class=\"practice-mcqs\">\r\n                <h2>Knowledge Check<\/h2>\r\n                <div class=\"mcq-box\" style=\"background: #f9f4ff; padding: 20px; border-radius: 10px; border: 1px solid #e9d5ff;\">\r\n                    <p><strong>1. Why do we use branching?<\/strong><br>\r\n                    A) To delete code | B) <strong>To work on features without breaking the main code<\/strong> | C) To make Git slower<\/p>\r\n                    \r\n                    <p><strong>2. What is a \"Merge Conflict\"?<\/strong><br>\r\n                    A) When Git crashes | B) <strong>When two branches change the same line of a file<\/strong> | C) When you delete a branch<\/p>\r\n\r\n                    <p><strong>3. Which command is used to combine branches?<\/strong><br>\r\n                    A) git commit | B) <strong>git merge<\/strong> | C) git branch<\/p>\r\n                <\/div>\r\n            <\/section>\r\n\r\n            <div style=\"text-align: center; margin-top: 40px;\">\r\n                <a href=\"https:\/\/codematrix.co.in\/courses\" target=\"_blank\" style=\"background: var(--brand-purple); color: white; padding: 12px 25px; text-decoration: none; border-radius: 8px; display: inline-block; font-weight: bold;\">\r\n                    \ud83d\ude80 Master Your Git Workflow!\r\n                <\/a>\r\n            <\/div>\r\n\r\n        <\/article>\r\n    <\/main>\r\n<\/div>\r\n\r\n<script>\r\nwindow.addEventListener('DOMContentLoaded', () => {\r\n    const sections = document.querySelectorAll('header[id], section[id]');\r\n    const navLinks = document.querySelectorAll('.sidebar .topic');\r\n\r\n    const observer = new IntersectionObserver((entries) => {\r\n        entries.forEach(entry => {\r\n            if (entry.isIntersecting) {\r\n                navLinks.forEach(link => {\r\n                    link.classList.remove('active');\r\n                    if (link.getAttribute('href') === `#${entry.target.id}`) {\r\n                        link.classList.add('active');\r\n                    }\r\n                });\r\n            }\r\n        });\r\n    }, { threshold: 0.5 });\r\n    sections.forEach(section => observer.observe(section));\r\n});\r\n<\/script>\t\t\t\t<\/div>\n\t\t\t\t\t<\/div>\n\t\t\t\t<\/div>\n\t\t\t\t<\/div>\n\t\t","protected":false},"excerpt":{"rendered":"<p>Git Workflow 1. Branching 2. Merging 3. Merge Conflicts 4. Common Commands Practice MCQs Branching &#038; Merging In version control (like Git), Branching allows you to diverge from the main line of development and continue to work without affecting that main line. Merging is the process of putting those changes back together. 1. What is [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"parent":0,"menu_order":0,"comment_status":"closed","ping_status":"closed","template":"","meta":{"site-sidebar-layout":"no-sidebar","site-content-layout":"","ast-site-content-layout":"full-width-container","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"disabled","footer-sml-layout":"","ast-disable-related-posts":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"class_list":["post-4331","page","type-page","status-publish","hentry"],"_links":{"self":[{"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/pages\/4331","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/pages"}],"about":[{"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/types\/page"}],"author":[{"embeddable":true,"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/comments?post=4331"}],"version-history":[{"count":7,"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/pages\/4331\/revisions"}],"predecessor-version":[{"id":5438,"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/pages\/4331\/revisions\/5438"}],"wp:attachment":[{"href":"https:\/\/codematrix.co.in\/blog\/wp-json\/wp\/v2\/media?parent=4331"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}