Question

Merge conflict on originated_in_project_id and originated_in_project_vrs_id

  • 19 February 2021
  • 1 reply
  • 28 views

Userlevel 4
Badge +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?


1 reply

Userlevel 4
Badge +9

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. 

Reply