The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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!!!
HiCan you provide more details, e.g. screenshots?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Still have a question?
Get fast answers from people who know.