<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<font face="Ubuntu">Hi,<br>
<br>
Sorry, I meant for those 2 specific files. So that conflict on
those 2 files is only those lines.<br>
<br>
In any case, please do as follow:<br>
<br>
cd /etc/ngcp-config<br>
</font><span><span> </span><span class="token token">git</span><span>
checkout --theirs templates/etc/kamailio/proxy/dialog.cfg.tt2 </span></span><span><span></span><span
class="token token"><br>
git</span><span> checkout --theirs
templates/etc/kamailio/proxy/proxy.cfg.tt2 <br>
</span></span><span><span></span><span class="token token">git</span><span>
</span><span class="token token">add</span><span>
templates/etc/kamailio/proxy/dialog.cfg.tt2 </span></span><span><br>
<span></span><span class="token token">git</span><span> </span><span
class="token token">add</span><span>
templates/etc/kamailio/proxy/proxy.cfg.tt2</span></span>
<div class="moz-cite-prefix"><span class="token token assign-left">GIT_EDITOR</span><span
class="token token">=</span><span>true </span><span
class="token token">git</span><span> rebase --continue<br>
</span>/usr/share/ngcp-ngcpcfg/helper/restore-permissions
/etc/ngcp-config/<br>
<span class="token token">git</span><span> remote remove
upgrade_origin</span><br>
<span><br>
And then edit
"/usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback"
and insert "exit 0" at the beginning of the script like:<br>
</span><br>
diff -u
/usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
merge_commits_from_fallback <br>
---
/usr/share/ngcp-upgrade/steps/mr9.5/merge_commits_from_fallback
2026-06-25 10:30:28.000000000 +0200<br>
+++ merge_commits_from_fallback 2026-06-26 10:38:09.443966814
+0200<br>
@@ -2,6 +2,8 @@<br>
<br>
set -eEuo pipefail<br>
<br>
+exit 0<br>
+<br>
remote_name='upgrade_origin'<br>
<br>
cd /etc/ngcp-config<br>
<br>
After that please continue with the upgrade.<br>
<br>
Best regards,<br>
Jose Su<br>
<br>
On 6/26/26 09:46, SPCE Newbie wrote:<br>
</div>
<blockquote type="cite" cite="mid:20260626084600.5a661cb0@tel.co.uk">
<pre wrap="" class="moz-quote-pre">Hi,
Not that I'm aware of but happy to provide more diffs.
SPCE Newbie
------ Original Message -----
Date: Fri, 26 Jun 2026 09:09:07 +0200
From: Jose Antonio Su Ng <a class="moz-txt-link-rfc2396E" href="mailto:jsung@sipwise.com"><jsung@sipwise.com></a>
To: SPCE Newbie <a class="moz-txt-link-rfc2396E" href="mailto:spce-user@tel.co.uk"><spce-user@tel.co.uk></a>
Cc: Spce-user <a class="moz-txt-link-rfc2396E" href="mailto:spce-user@lists.sipwise.com"><spce-user@lists.sipwise.com></a>
Subject: Re: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade Failure
Hi,
Is the merge conflict for only those few lines per file? Or it is more?
Best regards,
Jose Su
On 6/25/26 16:17, SPCE Newbie wrote:
</pre>
<blockquote type="cite">
<pre wrap="" class="moz-quote-pre">Good afternoon Jose,
Not production. Minimally configured. Can reinstall from the
mr26.1.0 ISO.
----- Original Message -------
Date: Thu, 25 Jun 2026 13:44:14 +0100
From: SPCE Newbie<a class="moz-txt-link-rfc2396E" href="mailto:spce-user@tel.co.uk"><spce-user@tel.co.uk></a>
To: Spce-user<a class="moz-txt-link-rfc2396E" href="mailto:spce-user@lists.sipwise.com"><spce-user@lists.sipwise.com></a>
Subject: RE: [EXTERNAL] [Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade
Failure
Good afternoon Jose,
Not that I am aware of.
* 1e72820 (3 hours ago) Upgrade to mr26.0.1 [2026-06-25 11:37:56
+0200] (master)
* 128a86f (3 months ago) committing uncommented changes [2026-03-27
16:26:20 +0100]
* 420f82b (3 months ago) committing uncommented changes [2026-03-18
11:49:20 +0100]
# apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
ngcp-upgrade-ce:
Installed: 26.0.1.3+0~mr26.0.1.3
Candidate: 26.0.1.3+0~mr26.0.1.3
Version table:
*** 26.0.1.3+0~mr26.0.1.3 990
990https://deb.sipwise.com/spce/mr26.0.1 trixie/main amd64
Packages 100 /var/lib/dpkg/status
ngcp-templates-ce:
Installed: 26.0.1.26+0~mr26.0.1.26
Candidate: 26.0.1.26+0~mr26.0.1.26
Version table:
*** 26.0.1.26+0~mr26.0.1.26 990
990https://deb.sipwise.com/spce/mr26.0.1 trixie/main amd64
Packages 100 /var/lib/dpkg/status
# cd /etc/ngcp-config
[sipwise-prod-mr26.0.1] root@hostname:/etc/ngcp-config (master
*+|REBASE 1/1)# git diff templates/etc/kamailio/proxy/dialog.cfg.tt2
diff --cc templates/etc/kamailio/proxy/dialog.cfg.tt2 index
6c8fe18,aa4e0b8..0000000 ---
a/templates/etc/kamailio/proxy/dialog.cfg.tt2 +++
b/templates/etc/kamailio/proxy/dialog.cfg.tt2 @@@ -1203,6 -1203,10
+1203,13 @@@ event_route[dialog:end {
xlog("$var(log_info)", "[dialog:end]
lua_dlg_callid:[«$dlg_var(lua_dlg_callid)»] - [% logreq %]\n");
++<<<<<<< HEAD
++=======
+ [%- IF ENABLE_MULTIPRX %]
+ route(ROUTE_CLEAN_ALL_MULTIPROXY_KEYS);
+ [%- END %]
+
++>>>>>>> 1e72820 (Upgrade to mr26.0.1)
if ($dlg_var(unpark_request) == "1")
{
xlog("$var(log_notice)", "[dialog:end] this is
unparking leg, allow further processing in dialog:end - [% logreq
%]\n");
# git diff templates/etc/kamailio/proxy/proxy.cfg.tt2
diff --cc templates/etc/kamailio/proxy/proxy.cfg.tt2
index 09037e1,ca71fcb..0000000
--- a/templates/etc/kamailio/proxy/proxy.cfg.tt2
+++ b/templates/etc/kamailio/proxy/proxy.cfg.tt2
@@@ -1270,6 -1298,8 +1298,11 @@@ route[ROUTE_INITVARS
$var(out_colp_display) = 0;
$var(out_colp_name) = 0;
++<<<<<<< HEAD
++=======
+ $var(rtpengine_likely_b_leg) = 0;
+
++>>>>>>> 1e72820 (Upgrade to mr26.0.1)
if(!has_totag() && !t_is_failure_route())
{
# set defaults for calls to or from voicebox,
faxserver etc which have no prefs
# chroot /ngcp-fallback/
root@hostname:/# apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
ngcp-upgrade-ce:
Installed: 26.0.1.3+0~mr26.0.1.3
Candidate: 26.0.1.3+0~mr26.0.1.3
Version table:
*** 26.0.1.3+0~mr26.0.1.3 100
100 /var/lib/dpkg/status
14.1.1.6+0~mr14.1.1.6 990
990https://deb.sipwise.com/spce/mr14.1.1 trixie/main amd64
Packages ngcp-templates-ce:
Installed: 14.1.1.23+0~mr14.1.1.23
Candidate: 14.1.1.23+0~mr14.1.1.23
Version table:
*** 14.1.1.23+0~mr14.1.1.23 990
990https://deb.sipwise.com/spce/mr14.1.1 trixie/main amd64
Packages 100 /var/lib/dpkg/status
TIA
SPCE Newbie
----- Original Message -----
Date: Thu, 25 Jun 2026 14:04:04 +0200
From: Jose Antonio Su Ng<a class="moz-txt-link-rfc2396E" href="mailto:jsung@sipwise.com"><jsung@sipwise.com></a>
To: SPCE Newbie<a class="moz-txt-link-rfc2396E" href="mailto:spce-user@tel.co.uk"><spce-user@tel.co.uk></a>,
Spce-user<a class="moz-txt-link-rfc2396E" href="mailto:spce-user@lists.sipwise.com"><spce-user@lists.sipwise.com></a> Subject: Re: [EXTERNAL]
[Spce-user] ISSUE: mr14.1.1-mr26.0.1 Upgrade Failure
Hi,
Did you made any changes on those 2 files where there is a merge
conflict?
Could you provide the following outputs:
- ngcpcfg log -n 3
- apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
- cd /etc/ngcp-config
- git diff templates/etc/kamailio/proxy/dialog.cfg.tt2
- git diff templates/etc/kamailio/proxy/proxy.cfg.tt2
- chroot /ngcp-fallback/
- apt-cache policy ngcp-upgrade-ce ngcp-templates-ce
Best regards,
Jose Su
On 6/25/26 11:53, SPCE Newbie wrote:
</pre>
<blockquote type="cite">
<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>
</blockquote>
</blockquote>
</blockquote>
<br>
</body>
</html>