During a merge session in SF2023.1, we get the following error
“The INSERT statement conflicted with the FOREIGN KEY constraint "ref_change_log_change_log_template". The conflict occurred in database "xxxx_SF", table "dbo.change_log".
There were some merge conflicts we resolved before the task was started.
I've got no idea how to solve this. Can we solve this, or is this an issue in the SF? Any help would be appreciated.
Best answer by Mark Jongeling
View original
+23
Hi André,
This looks like a “Changelog template” being added to the branch but there's no corresponding "Changelog” record. Can you look through the Conflicts and Actions to see if the Changelog record is also inserted?
Hi Mark,
Thanks for your quick response. Somehow the conflicts where not correctly resolved (i think). I found for some conflicts had the wrong resolution type. For now the error during the merge session is gone 😅
However, now the following error occurs
I think i need some help on this too. I the resolution of conflicts was not carried out correctly.
Thanks in advance.
+23
Hi André,
You can edit the Delete Delta actions for Process actions to not be applied. This will prevent the process action(s) to be deleted and rather keeps them in the model. After the merge, you can take a look at the process actions and review if they should still exist or not.
Usually these kinds of error occur when resolving conflicts incorrectly, but that is difficult to judge for me form here 😅 If this doesn't solve the issue, you can create a ticket so our support team can help out
Hi Mark,
Thanks again for your response. Your answers put me in the right direction and will help me! If it won't i will create a ticket.
Enter your username or e-mail address. We'll send you an e-mail with instructions to reset your password.
