Hi there,

we are facing a big problem regarding the upgrade of IFS cloud from 21R2 to 22R1:

The error is:

PS C:\GIT\customer-solution> git checkout --theirs *

No solution in Documentation: I will remove the Problematic files with git rm *fileName*:
git rm fltpln/test/fltpln/database/FltAircraftTemp.plsvt
git rm fltpln/test/fltpln/database/FltAircraftWi.plsvt
git rm fltpln/test/fltpln/database/FltTrackStg.plsvt
git rm fltpln/test/fltpln/database/FltTrackWi.plsvt
git rm fndmig/test/fndmig/database/ExecuteJobHandling.plsvt
git rm inttst/test/inttst/5.28.10.3/EnterParameter/util/EnterParameter.mkd
git rm inttst/test/inttst/5.28.10.3/EnterTestPoint/util/EnterTestPoint.mkd
git rm inttst/test/inttst/5.28.10.4/DefineSafeAccess/util/DefineSafeAccess.mkd
git rm inttst/test/inttst/5.28.10.4/SpreadSafeAccess/util/SpreadSafeAccess.mkd
git rm inttst/test/inttst/5.28.10.7/ConnectCustomerToObject/util/ConnectCustomerToObject.mkd
git rm inttst/test/inttst/5.28.9.3/ChangeOperationalStatus/util/ChangeOperationalStatusInStructure.mkd
git rm inttst/test/inttst/8.2.4.1/QuickSupplierRegistration/util/QuickRegisteredSupplierWithTemplate.mkd
git rm inttst/test/inttst/9.2.5.2/ReportArrival/util/SelectFromInTransit.mkd
git rm inttst/test/inttst/9.2.5.2/ReportArrivalWithSerials/util/SelectFromInTransit.mkd
git rm inttst/test/inttst/9.6.2.1/EnterShipmentOrder/util/ModifyLeadTimes.mkd
git rm invoic/model/invoic/InvoiceTransfer.fragment
git rm invoic/model/invoic/SendItEinvoiceMsgUtil.fragment
git rm invoic/model/invoic/SendItEinvoiceMsgUtil.utility
git rm invoic/source/invoic/database/SendItEinvoiceMsgUtil.plsql
git rm srvcon/source/srvcon/database/Post_Srvcon_UpdateTempLobbyTables.sql
git rm subcon/source/subcon/database/BIServices/Mv_SubconFactSubContractCallOff.cre
git rm subcon/source/subcon/database/BIServices/Mv_SubconFactSubContractItem.cre
git rm subval/source/subval/database/BIServices/Mv_SubvalFactSubvalLineItem.cre
git rm tabmfw/source/tabmfw/database/21R2-GA.cdb
git rm trvexp/model/trvexp/AddExpenseDialog.fragment
git rm trvexp/model/trvexp/DuplicateExpenseSheetAssistant.fragment
git rm trvexp/model/trvexp/ExpenseSheetCommands.fragment
Release Update Seite 2
git rm trvexp/model/trvexp/ExpenseSheetCommands.fragment
git rm trvexp/model/trvexp/TravelExpenses.fragment
git rm trvexp/source/trvexp/database/DuplicateExpenseSheetAssistant.plsvc

Has anyone a idea to solve this problem? The upgrade always fails