JIYIK CN >

Git is used to keep track of the source code we are working with; it also facilitates collaboration and helps us keep our projects in their current state.

As we develop new features, their history should be at our fingertips as it is very helpful in developing any application or documentation.

Git overwrites Master with branch

Git has two ways to mix changes from one branch into another. One is to merge changes from one branch into another repository rebase, and the other is to merge changes from any branch 合并into another repository.

This article will discuss cleanly merging a branch in Git from another repository branch master.

When using a Git workflow, the changes we make to the code must eventually end masterup in a branch when the application task is completed.

We also have to understand that we might have developed some other branch which contains code changes which are not ready for production deployment and we name that branch as per the organizational requirements and rules dev.

In some cases, we devmade too many changes to the branch and then faced difficulties in combining devthe branch with masterthe branch; it could not be performed easily.

One way to overcome this busy situation is to devcompletely replace our masterbranch with the branch. We can do it in two ways.

The merge strategy isOurs

To accomplish this strategy, we will first execute the following command to merge the branch into the branch ourswith the help of the merge strategy as shown below.devmaster

git checkout dev
git merge -s ours master
git checkout master
git merge dev

The option in the merge --strategy=oursis intended to replace the old history of the feature branch. Now our masterwill have devall the contents of and ignore masterall changes in .

By applying this approach, we will get a clean and safe merge commit; other developers working with these branches can also benefit from this merge as they will not face problems when merging their feature branches.

On the other hand, the disadvantage of this approach is that if our devbranch and masterbranch radiate to a larger scale in the project, this merge may not work.

Force push

Another option is to force push of devthe branch under a different name, but this approach is brute force compared to the issues discussed above.

git push -f origin dev: master

With the help of the alias flag mentioned in the command -f, our previous branch masteris completely devoverwritten by the branch, including the history.

We have to be very careful while applying the above method as it will remove masterall the commits present in the branch as they devare also not available in the repository's branch.