<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
Hello<br>
<blockquote type="cite"
cite="mid:287836062.353229.1716395348337.JavaMail.zextras@connectlife.it">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<div
style="font-family: arial, helvetica, sans-serif; font-size: 10pt; color: #000000">
<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>
</div>
</blockquote>
Well, 1st of all I guess it's mr11.5.1->mr12.3.1 (not
mr11.4.1->mr12.3.1 as stated in subject) upgrade, correct?<br>
<br>
I need the mentioned
(/ngcp-data/ngcp-upgrade/mr11.5.1-mr12.3.1/logs/ngcp-upgrade-mr11.5.1-mr12.3.1-1716394870.log)
log, or at least the part with previous (commit_upgraded_ngcpcfg)<br>
step.<br>
<br>
Also it would be helpful if you provide the output of 'git status'
in /etc/ngcp-config dir.<br>
<pre class="moz-signature" cols="72">--
WBR
---
Mykola Malkov</pre>
</body>
</html>