Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,363,057
Community Members
 
Community Events
168
Community Groups

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

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.

0 comments

Comment

Log in or Sign up to comment
TAGS

Atlassian Community Events