<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<font face="Ubuntu">Hi,<br>
<br>
Did you made any changes on those 2 files where there is a merge
conflict?<br>
<br>
Could you provide the following outputs:<br>
<br>
- ngcpcfg log -n 3<br>
- apt-cache policy ngcp-upgrade-ce ngcp-templates-ce<br>
- cd /etc/ngcp-config<br>
- git diff templates/etc/kamailio/proxy/dialog.cfg.tt2<br>
- git diff templates/etc/kamailio/proxy/proxy.cfg.tt2<br>
- chroot /ngcp-fallback/<br>
</font><font face="Ubuntu">- apt-cache policy ngcp-upgrade-ce
ngcp-templates-ce<br>
</font><br>
<font face="Ubuntu">Best regards,<br>
Jose Su<br>
<br>
</font>
<div class="moz-cite-prefix">On 6/25/26 11:53, SPCE Newbie wrote:<br>
</div>
<blockquote type="cite" cite="mid:20260625105354.44767096@tel.co.uk">
<pre wrap="" class="moz-quote-pre">Hi,
mr14.1.1 was at "green" status -- both systemctl status and ngcp-status
Second stage upgrade failed:
OK: the current partition is mr26.0.1, continue the upgrade
2026-06-25 11:37:55: [49/63] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/commit_upgraded_ngcpcfg
Restoring correct permissions
2026-06-25 11:37:56 spce: OK
2026-06-25 11:37:58: [50/63] 'spce' Running: /usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
Checking remote 'upgrade_origin'...
No remote 'upgrade_origin' detected, creating...
Getting commits from old partition
>From /ngcp-fallback/etc/ngcp-config
* branch master -> FETCH_HEAD
* [new branch] master -> upgrade_origin/master
Auto-merging templates/etc/kamailio/proxy/callforward.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/dialog.cfg.tt2
CONFLICT (content): Merge conflict in templates/etc/kamailio/proxy/dialog.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/kamailio.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/proxy.cfg.tt2
CONFLICT (content): Merge conflict in templates/etc/kamailio/proxy/proxy.cfg.tt2
Auto-merging templates/etc/kamailio/proxy/rtpengine.cfg.tt2
error: could not apply 1e72820... Upgrade to mr26.0.1
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Recorded preimage for 'templates/etc/kamailio/proxy/dialog.cfg.tt2'
Recorded preimage for 'templates/etc/kamailio/proxy/proxy.cfg.tt2'
Could not apply 1e72820... Upgrade to mr26.0.1
ERROR: the step 'mr9.5/merge_commits_from_fallback' failed, upgrade aborted!
Please fix the root of the issue and restart 'ngcp-upgrade'
(see error details in log file /ngcp-data/ngcp-upgrade/mr14.1.1-mr26.0.1/logs/ngcp-upgrade-mr14.1.1-mr26.0.1-1782380247.log ).
The log file is attached.
</pre>
<br>
<fieldset class="moz-mime-attachment-header"></fieldset>
</blockquote>
<br>
</body>
</html>