👉 🔥 CLICK HERE! 🔥 👈

During a merge, the working tree files are updated to reflect the resultof the merge. Among the changes made to the common ancestors version,non-overlapping ones (that is, you changed an area of the file while theother side left that area intact, or vice versa) are incorporated in thefinal result verbatim. When both sides made changes to the same area,however, Git cannot randomly pick one side over the other, and asks you toresolve it by leaving what both sides did to that area.By default, Git uses the same style as the one used by the merge programfrom the RCS suite to present such a conflicted hunk, like this:Here are lines that are either unchanged from the commonancestor, or cleanly resolved because only one side changed,or cleanly resolved because both sides changed the same way.<<<<<<< yours:sample.txtConflict resolution is hard;lets go shopping.=======Git makes conflict resolution easy.>>>>>>> theirs:sample.txtAnd here is another line that is cleanly resolved or unmodified.The area where a pair of conflicting changes happened is marked with markers<<<<<<<, =======, and >>>>>>>. The part before the =======is typically your side, and the part afterwards is typically their side.The default format does not show what the original said in the conflictingarea. You cannot tell how many lines are deleted and replaced withBarbies remark on your side. The only thing you can tell is that yourside wants to say it is hard and youd prefer to go shopping, while theother side wants to claim it is easy.An alternative style can be used by setting the merge.conflictStyleconfiguration variable to either diff3 or zdiff3. In diff3style, the above conflict may look like this:Here are lines that are either unchanged from the commonancestor, or cleanly resolved because only one side changed,<<<<<<< yours:sample.txtor cleanly resolved because both sides changed the same way.Conflict resolution is hard;lets go shopping.||||||| base:sample.txtor cleanly resolved because both sides changed identically.Conflict resolution is hard.=======or cleanly resolved because both sides changed the same way.Git makes conflict resolution easy.>>>>>>> theirs:sample.txtAnd here is another line that is cleanly resolved or unmodified.while in zdiff3 style, it may look like this:Here are lines that are either unchanged from the commonancestor, or cleanly resolved because only one side changed,or cleanly resolved because both sides changed the same way.<<<<<<< yours:sample.txtConflict resolution is hard;lets go shopping.||||||| base:sample.txtor cleanly resolved because both sides changed identically.Conflict resolution is hard.=======Git makes conflict resolution easy.>>>>>>> theirs:sample.txtAnd here is another line that is cleanly resolved or unmodified.In addition to the <<<<<<<, =======, and >>>>>>> markers, it usesanother ||||||| marker that is followed by the original text. You cantell that the original just stated a fact, and your side simply gave in tothat statement and gave up, while the other side tried to have a morepositive attitude. You can sometimes come up with a better resolution byviewing the original.View DiscussionImprove ArticleSave ArticleLike ArticleReadDiscussView DiscussionImprove ArticleSave ArticleLike ArticleGit is the most popular version control system which records the changes made to our project over time in a special database called a repository. We can look at our project and see who has made what changes when and why and if we screw something up we can easily revert our project back to an earlier state. In this article, we will seeThe concept of git branch mergingEssential git commands to do so andThe core meaning of those commandsNote: Key TerminologiesCurrent branch: The branch to be mergedTarget Branch: The branch in which we want to merge the current branchConcept of Git mergingThe concept of git merging is basically to merge multiple sequences of commits, stored in multiple branches in a unified history or to be simple you can say in a single branch.What happens is when we try to merge two branches, git takes two commit pointers and starts searching for a common base commit in those two specified bit branches. When git finds the common base commit it simply creates a merge commit automatically and merges each queued merge commit sequence.There is a proper merging algorithm in git, with the help of which git performs all of these operations and presents conflicts if there are any.In our case, we have two branches one is the default branch called main and the other branch named dev and this is how our git repo looks before merging.Here git finds the common base, creates a new merge commit, and merged them.A git merge operation is performed by running the command git merge <name of the branch to be merged (in our case it is dev)>. When we perform merging, git always merges with the current branch from where we are performing the operation(in our case it is main). By this, the branch being merged is not affected.Types of merges:Fast-forward mergeThree way mergeFast forward merge happens when the tip of the current branch (dev in our case) is a direct ancestor of the target branch (main in our case). Here instead of actually merging the two branches git simply moves the current branch tip up to the target branch tip. Fast-forward merge is not possible if the branches have diverged. Then we need a 3-way merge which uses a dedicated commit to merge two histories or you can say branches.Essential Commands to perform Git merging and their core meaningsFirst of all, to perform the git merge operation we have to have a git repo and at least two branches in it. Initially (when we initialize a git repo by running the git init command) we have one default branch in any git repo. So. first of all we have to create another branch. To do so we have to run the below commandgit branch <name of the branch you wanna create>In our case the name of the branch is dev.Created two branchesHere we have created two branches one is the default main and another is dev. We have also committed two changes in two branches.Now to merge these two branches first we have to follow the below stepscheckout to the target branch to merge the current branchthen run the below commandgit merge <name of the current branch>Merged two branchesNow we have successfully merged our two branches and as you can see we have same changes or you can say commits in our both branches.

Items