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
Community Members
Community Events
Community Groups

Resolve merge conflict

How to resolve merge conflicts caused by multiple files in the same branch. There should be only one file for a branch. How to remove the unwanted files? Don't know how they got there in the first place!!!

1 answer

0 votes
minnsey Atlassian Team Apr 08, 2019


Can you provide more details, e.g. screenshots?

Suggest an answer

Log in or Sign up to answer

Atlassian Community Events