Skip to main content
Solved

Merge action conflict, confusing Source and Target designation

  • 4 September 2024
  • 1 reply
  • 23 views

When I have a conflict during merging, the source branch is the same as the target branch for the details.
I think it's a bit confusing. Shouldn't the name of the branch in the second column not be  SGT-263_AUTO_DEPLOY?

 

 

Hi Dave,

We changed this for the 2024.3, so resolved 😄:

Source and Target branch shown correctly

 


Reply