Skip to main content
Solved

Merge action conflict, confusing Source and Target designation

  • September 4, 2024
  • 1 reply
  • 27 views

Dave Bieleveld Starcode
Vanguard
Forum|alt.badge.img+2

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?

 

 

Best answer by Mark Jongeling

Hi Dave,

We changed this for the 2024.3, so resolved 😄:

Source and Target branch shown correctly

 

View original
Did this topic help you find an answer to your question?
This topic has been closed for comments

1 reply

Mark Jongeling
Administrator
Forum|alt.badge.img+23
  • Administrator
  • 3908 replies
  • Answer
  • September 4, 2024

Hi Dave,

We changed this for the 2024.3, so resolved 😄:

Source and Target branch shown correctly

 


Cookie policy

We use cookies to enhance and personalize your experience. If you accept you agree to our full cookie policy. Learn more about our cookies.

 
Cookie settings