JIYIK CN >

When developing software using Git, you can create different branches for different functions, but conflicts may exist between different branches.

This article will explain how to use the command with theirsthe -c option git mergeto resolve conflicts.

Use git mergethe command with Gittheirs

git mergeThe command can merge two or more development histories. However, sometimes this merge cannot be completed due to conflicts between branches.

ourstheirsThe files in or should be discarded to resolve this conflict.

oursRefers to the original working branch with Git history permissions, theirsand refers to the branch that contains the new application commits.

You can use git merge -s oursdiscard ourschanges in . This command discards all changes from other branches and leaves the files on your branch unchanged.

When you next merge from another branch, Git will only consider the changes made from that point on. However, -sthe -d option cannot theirsbe used with .

--strategy-optionResolving conflicts in Git using

Alternatively, we can use theirswith the -Xor --strategy-optionoptions.

-X-sThe main difference between the -m and -m options is that -X-m performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s-m changes the merge to ignore the other side completely.

The following commands use theirsto resolve any conflicts.

git merge -X theirs branchname

Merging using temporary branches in Git

Use the command below to test2merge into the checked out test1.

Switch to test1the branch.

git checkout test1

Merge commits without conflicts. oursThe contents of will be discarded later.

git merge -s ours test2

Create a temporary branch.

git branch temp

Use git resetthe command to set it HEAD. It test2gets the content from the branch.

git reset --hard test2

Reset to a merge commit but git reset --softkeep the contents using the command.

git reset --soft temp

Change the contents of test2the merge commit with the contents of .

git commit --amend

Delete the temporary branch we created earlier.

git branch -D temp

You can see that the merged commit contains only test2the contents of .

git diff HEAD test2