Skip to main content
Solved

Merge conflict on originated_in_project_id and originated_in_project_vrs_id

  • February 19, 2021
  • 1 reply
  • 46 views

Forum|alt.badge.img+15

Since we've upgraded to SF2021.1 I notice that the merge sessions always contain conflicts regarding the columns originated_in_project_id and originated_in_project_vrs_id. This happens for example when a template is removed in a branch and then merged back to the trunk (without any other merge sessions in between).

I don't exactly understand why this conflict is there, but it keeps returning. For the example above I've removed a process flow step template, so this one can be resolved choosing the branch value. But I'm not sure if this is intended?

Best answer by Erwin Ekkel

I was able to recreate this issue. Tomorrow I will create a bug for this on your behalf. Any updates on this issue will be communicated there. 

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

1 reply

Forum|alt.badge.img+17
  • Moderator
  • 765 replies
  • Answer
  • February 22, 2021

I was able to recreate this issue. Tomorrow I will create a bug for this on your behalf. Any updates on this issue will be communicated there. 


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