How can i merge new development branch to existing branch with conflict file.

Ranjithkumar July 4, 2017

I clone the code from master branch and named as existing branch.Now i again clone the code from existing branch and named as new branch.I develop existing branch and new branch parallely.Now i can not merge new branch to existing branch due to some conflicts file is there.how can i move it to existing branch with the help of source tree tool.I am using bit bucket and source tree.

1 answer

0 votes
Manju
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
July 6, 2017

Conflicts happen when there are changes for the same file on both branches and are unavoidable. You can perform a merge and when it results in a conflict, you can resolve the conflicts by using external merge tools such as FileMerge that comes by default on mac, DiffMerge and other thirdt party tools. 

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events