JIYIK CN >

Creating new branches and merging them is considered to be the most powerful tool of Git. The ability of Git to create new branches and merge them into the development code is very useful for developers working in a team environment.

This feature simplifies the development process of basic projects by stimulating smaller, more powerful commits. This guide will discuss different scenarios for creating feature branches and merging Git feature branches with the main branch using Git commands.

Git merge development branch into feature branch

If we use branches assigned to features or hotfixes, we create branches from other branches to work on the project we want. If we create a branch from another branch, it is as simple as creating it from the main branch.

To do this, we have to specify the name of the other branch that we want to use as a starting point. We will create a feature branch feature2 from the develop branch by following the code mentioned below .

Therefore, all the files and codes of that branch will be merged into the branch we specified.

$ git checkout -b feature2 develop

After we checkout the new branch feature2 above , we will checkout the developed branch below to get the changes and merge them into the branch above.

$ git checkout develop

We will first pull the changes from the develop branch using the git pull command . The command will fetch the content from the develop branch and update the content into the feature2 branch.git pull

$ git pull

Now we will check out the local branch by following command.

$ git checkout feature2

After that, we will execute the merge options. The following options help us to integrate the differences of one branch into another branch.

In order to perform this option (merge), we have to specify which branch's commits we want to integrate.

$ git merge feature/login

As we know, Git performs integration automatically, but sometimes it causes merge conflicts that users have to resolve themselves. We have another merge option.

If we are on our feature branch feature2 , we can also do the following.

$ git fetch && git rebase origin/develop