Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Status, Continue, and Abort of Merges is confusing, rough workflow

Robert B_ Hanviriyapunt
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
August 25, 2025

I'm going to compare some w/ a git plugin in PyCharm.

PyCharm shows actions to continue or abort merge at the top when in the middle of one.  Wish Sourcetree had something up front like that.

When conflict are resolved via a FileMerge, the result is not added or something, because Sourcetree seems to be confused and can't continue thinking things are still unresolved.  I had to go to commandline and add the files.  Tried to a UI equivalent.  Can't remember the exact process when it worked -- sometimes it didn't.

 

1 answer

0 votes
Valerie Knapp
Community Champion
October 16, 2025

Hi @Robert B_ Hanviriyapunt , welcome to the Atlassian Community and thanks for your post.

I believe this is more of a suggestion, than a question. Is that accurate, would you say?

I will direct this post to Atlassian to see how they want to treat this or respond.

I did a quick search but I don't find any roadmap for Sourcetree but again, I will leave Atlassian to reply to you about the plans for that.

Best wishes

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
SERVER
TAGS
AUG Leaders

Atlassian Community Events