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
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

850 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you