Error while merging two branch which has files with same name Please help

Gaurav Saxena October 7, 2014

image2014-10-8 16:59:13.png

1 answer

1 vote
Balázs Szakmáry
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
October 7, 2014

You need to resolve the merge conflict locally, not on the server.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events