[Spce-user] Error upgrade mr11.4.1 to mr12.3.1

Wed May 22 12:29:08 EDT 2024

<html><body><div style="font-family:'arial' , 'helvetica' , sans-serif;font-size:10pt;color:#000000"><p>Hi i'm try to upgrade mr11.4.1 to mr12.3.1</p>
<p>During upgrade second partition i'm get this error:</p>
<p>Checking remote 'upgrade_origin'...<br />Remote 'upgrade_origin' detected, skipping creation...<br />Getting commits from old partition<br />error: Pulling is not possible because you have unmerged files.<br />hint: Fix them up in the work tree, and then use 'git add/rm <file>'<br />hint: as appropriate to mark resolution and make a commit.<br />fatal: Exiting because of an unresolved conflict.<br />ERROR: the step 'mr9.5/merge_commits_from_fallback' failed, upgrade aborted!<br />Please fix the root of the issue and restart 'ngcp-upgrade'<br />(see error details in log file /ngcp-data/ngcp-upgrade/mr11.5.1-mr12.3.1/logs/ngcp-upgrade-mr11.5.1-mr12.3.1-1716394870.log ).</p>
<p>Any idea?</p></div></body></html>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sipwise.com/pipermail/spce-user_lists.sipwise.com/attachments/20240522/354193f1/attachment.htm>