Merging Branches
Agar, target, branch, mein, SOURCE, branch, ke, BAAD, koi, NAYA, commit, NAHI, hua, hai, TO, Git, EK, "FAST-FORWARD" merge, karta hai — sirf, POINTER, ko, AAGE, MOVE, kar, deta hai.
Agar, DONO, branches, mein, INDEPENDENT, changes, hue, HAIN, TO, Git, EK, "THREE-WAY, merge" karta hai — EK, NAYA, "merge, commit" banata hai, DO, PARENTS, ke, saath.
git switch main
git merge feature-login
git merge --no-ff feature-login- Fast-forward merge = pointer bas aage move hota hai, naya merge commit nahi
- Three-way merge = independent changes hone par naya merge commit banta hai
- --no-ff se explicit merge commit force kiya ja sakta hai
Agar, target, branch, mein, SOURCE, branch, ke, BAAD, koi, NAYA, commit, NAHI, hua, hai, TO, Git, EK, "FAST-FORWARD" merge, karta hai — YE, sirf, POINTER, ko, AAGE, MOVE, kar, deta hai, koi, NAYA, "merge, commit" NAHI, banta.
git switch main
git merge feature-loginAgar, DONO, branches, mein, INDEPENDENT, changes, hue, HAIN, TO, Git, EK, "THREE-WAY, merge" karta hai — YE, DONO, branches, aur, UNKE, COMMON, ANCESTOR, ko, COMPARE, karke, EK, NAYA, "merge, commit" banata hai, DO, PARENTS, ke, saath.