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

[Mykola Malkov]

Hello
>
> Hi i'm try to upgrade mr11.4.1 to mr12.3.1
>
> During upgrade second partition i'm get this error:
>
> Checking remote 'upgrade_origin'...
> Remote 'upgrade_origin' detected, skipping creation...
> Getting commits from old partition
> error: Pulling is not possible because you have unmerged files.
> hint: Fix them up in the work tree, and then use 'git add/rm <file>'
> hint: as appropriate to mark resolution and make a commit.
> fatal: Exiting because of an unresolved conflict.
> 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/mr11.5.1-mr12.3.1/logs/ngcp-upgrade-mr11.5.1-mr12.3.1-1716394870.log 
> ).
>
> Any idea?
>
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?

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)
  step.

Also it would be helpful if you provide the output of 'git status' in 
/etc/ngcp-config dir.

-- 
WBR
---
Mykola Malkov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sipwise.com/pipermail/spce-user_lists.sipwise.com/attachments/20240523/b727a18c/attachment.htm>