Merging one branch (10.24.2) into another (9.24.34)

0
While attempting the merge from branch(10.24.2LTS) to target branch(9.24.34) , I am getting below error   How do I resolve this issue?   Microsoft.Data.Sqlite.SqliteException (0x80004005): SQLite Error 1: 'no such column: Contents'.   at Microsoft.Data.Sqlite.SqliteException.ThrowExceptionForRC(Int32 rc, sqlite3 db)   at Microsoft.Data.Sqlite.SqliteCommand.PrepareAndEnumerateStatements()+MoveNext()   at Microsoft.Data.Sqlite.SqliteCommand.GetStatements()+MoveNext()   at Microsoft.Data.Sqlite.SqliteDataReader.NextResult()   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader(CommandBehavior behavior)   at Mendix.Modeler.Storage.Operations.UnitLoader.LoadUnits(IStorageUnit unit, IList`1 unitIDs) in Mendix.Modeler.Storage\Operations\UnitLoader.cs:line 196   at Mendix.Modeler.Storage.Operations.UnitLoader.LoadChildUnits(IStorageUnit unit) in Mendix.Modeler.Storage\Operations\UnitLoader.cs:line 153   at Mendix.Modeler.Storage.Operations.UnitLoader.Load[T](IProgressInfo info, Dictionary`2 _knownUnits) in Mendix.Modeler.Storage\Operations\UnitLoader.cs:line 52   at Mendix.Modeler.Storage.Database.Load[T](IProgressInfo info, Dictionary`2 knownUnits, Boolean throwOnUnknownObjects) in Mendix.Modeler.Storage\Database.cs:line 221   at Mendix.Modeler.VersionControl.ProjectRefresher.<>c__DisplayClass4_0.<RefreshProject>b__0(IDatabase db) in Mendix.Modeler.VersionControl\ProjectRefresher.cs:line 38   at Mendix.Modeler.Storage.Database.<>c__DisplayClass23_0`1.<Do>b__0(IDbConnector connector) in Mendix.Modeler.Storage\Database.cs:line 170   at Mendix.Modeler.Storage.DbConnectors.SQLiteConnector.<>c__DisplayClass2_0`1.<Do>b__1() in Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 47   at Mendix.Modeler.Storage.DbConnectors.DbConnector.WithoutTransactionDo[TResult](Func`1 action) in Mendix.Modeler.Storage\DbConnectors\DbConnector.cs:line 52   at Mendix.Modeler.Storage.DbConnectors.SQLiteConnector.Do[TResult](String filePath, Boolean useTransaction, Func`2 action) in Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 47   at Mendix.Modeler.Storage.Database.Do[TResult](String filePath, Boolean useTransaction, Func`2 action) in Mendix.Modeler.Storage\Database.cs:line 170   at Mendix.Modeler.VersionControl.ProjectRefresher.RefreshProject(MprInfo outdatedMprInfo, IProject outdatedProject, IProgressInfo info) in Mendix.Modeler.VersionControl\ProjectRefresher.cs:line 38   at Mendix.Modeler.VersionControl.ProcessRunners.RefreshProjectStep.<>c__DisplayClass0_0.<Add>b__0(IProgressInfo info) in Mendix.Modeler.VersionControl.View\ProcessRunners\Merge\MergeSteps\RefreshProjectStep.cs:line 16   at Mendix.Modeler.VersionControl.ProcessRunners.MergeProcessStep.<>c__DisplayClass0_0.<AddProcessStep>b__0(IProgressInfo info) in Mendix.Modeler.VersionControl.View\ProcessRunners\Merge\MergeSteps\MergeProcessStep.cs:line 16   at Mendix.Modeler.Utility.Progress.StepBase`1.Run(TProgressInfo info) in Mendix.Modeler.Utility\Progress\Step.cs:line 31   at Mendix.Modeler.Utility.Progress.StepBase`1.Mendix.Modeler.Utility.Progress.IStep.Run(Object progressInfo) in Mendix.Modeler.Utility\Progress\Step.cs:line 36   at Mendix.Modeler.UIFramework.Progress.ProcessRunner.RunStep(IStep step) in Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 144   at Mendix.Modeler.UIFramework.Progress.ProcessRunner.OnDoWork(Object sender, DoWorkEventArgs e) in Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 82   at System.ComponentModel.BackgroundWorker.WorkerThreadStart(Object argument)--- End of stack trace from previous location ---   at Mendix.Modeler.UIFramework.Progress.ProcessRunner.Run() in Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 58   at Mendix.Modeler.VersionControl.RevMerger.DoMerge(IProject project, IMergeState state) in Mendix.Modeler.VersionControl.View\Merge\RevMerger.cs:line 185   at Mendix.Modeler.VersionControl.RevMerger.DoMergeWithTypeInteractively(IProject project, MergeType mergeType) in Mendix.Modeler.VersionControl.View\Merge\RevMerger.cs:line 83   at Mendix.Modeler.VersionControl.RevMerger.MergeInteractively(IProject project) in Mendix.Modeler.VersionControl.View\Merge\RevMerger.cs:line 64   at Mendix.Modeler.ProjectHandling.View.Commands.VersionControl.MergeChangesCommand.Call(IFeatureCommandContext context) in Mendix.Modeler.ProjectHandling.View\Commands\VersionControl\MergeChangesCommand.cs:line 23   at Mendix.Modeler.Core.Commands.FeatureCommand.Execute(IFeatureCommandContext context) in Mendix.Modeler.Core\Commands\FeatureCommand.cs:line 88
asked
2 answers
0

Hi Satya,

Upgrde the main line and then,

You can use the command line for merging the branches into the main line,

As for the other step, you can raise a ticket to Mendix support for the same.

 

As per the solution, the merge using the command line should work.

 

Let me know if you face any issues,

Hope it helps!

answered
1

It looks like you are trying to merge from a newer version of Mendix to an older version. This isn't possible. You would need to bring your target branch up to the same version of Mendix before merging.

 

I hope this helps.

answered