The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)
how do i resolve this? as far as I know I have resolved all conflicts, i just need to complete the merge and commit the changes. but the product wont let me and doesnt give me any clues as to what I am meant to do next!
2 answers
1 accepted
Comments for this post are closed
Community moderators have prevented the ability to post new answers.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.