Now, my remote repository will look like this: Now commit the changes and update it with the remote repository. Update it in the local repository with the help of git add command. The user1 made changes as below in my projects index file. Suppose my remote repository has cloned by two of my team member user1 and user2. If such a situation occurs, it stops just before the merge commit so that you can resolve the conflicts manually. Such a situation is called merge conflict. When two branches are trying to merge, and both are edited at the same time and in the same file, Git won't be able to identify which version is to take for changes. The syntax for the git merge command is as:Īs you can see from the given output, the whole commits of branch test2 have merged to branch master. The git merge command is used to merge the branches. Once Git finds a shared base commit, it will create a new 'merge commit.' It combines the changes of each queued merge commit sequence. It will find a common base commit between branches.

We can see that we made some commits in both functionality and master branch, and merge them. In the above figure, there are two branches master and feature. It is essential to understand how merging works in Git. It is used to maintain distinct lines of development at some stage, you want to merge the changes in one branch. Generally, git merge is used to combine two branches. Git merge will associate a series of commits into one unified history. The git merge command facilitates you to take the data created by git branch and integrate them into a single branch. It joins two or more development history together. In Git, the merging is a procedure to connect the forked history. Next → ← prev Git Merge and Merge Conflict

Github android studio merge branch