Resolve merge conflict

Partha Mandayam April 4, 2019

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
Atlassian Team members are employees working across the company in a wide variety of roles.
April 8, 2019

Hi

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

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events