Merge problem on private GIT

0
Hello,  when trying to “Merge changes here”,  I’m getting the next error When trying to do it with manually, (GIT bash) I’m getting conflict in the MPR file.  Mendix.Modeler.Utility.Progress.ProgressException ---> code = Error (1), message = System.Data.SQLite.SQLiteException (0x800007BF): SQL logic error no such table: _MetaData at System.Data.SQLite.SQLite3.Prepare(SQLiteConnection cnn, String strSql, SQLiteStatement previous, UInt32 timeoutMS, String& strRemain) at System.Data.SQLite.SQLiteCommand.BuildNextCommand() at System.Data.SQLite.SQLiteDataReader.NextResult() at System.Data.SQLite.SQLiteDataReader..ctor(SQLiteCommand cmd, CommandBehavior behave) at System.Data.SQLite.SQLiteCommand.ExecuteReader(CommandBehavior behavior) at Mendix.Modeler.Utility.DbConnectors.DbConnector.<>c_DisplayClass12_0.<ExecuteReader>b_0(DbCommand c) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\DbConnector.cs:line 156 at Mendix.Modeler.Utility.DbConnectors.DbConnector.CommandDo(String query, Object[] values, Action`1 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\DbConnector.cs:line 174 at Mendix.Modeler.Utility.DbConnectors.DbConnector.ExecuteReader(String query, Object[] values) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\DbConnector.cs:line 156 at Mendix.Modeler.Storage.Mpr.MprLoader.LoadMetadata(IDbConnector db, IProgressInfo info) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\Mpr\MprLoader.cs:line 58 at Mendix.Modeler.Storage.Mpr.MprLoader.<>c_DisplayClass0_0.<LoadMpr>b_0(IDbConnector db) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\Mpr\MprLoader.cs:line 18 at Mendix.Modeler.Utility.DbConnectors.SQLiteConnector.<>c_DisplayClass2_0.<Do>b_0(IDbConnector c) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 27 at Mendix.Modeler.Utility.DbConnectors.SQLiteConnector.<>c_DisplayClass3_0`1.<Do>b_1() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 44 at Mendix.Modeler.Utility.DbConnectors.DbConnector.WithoutTransactionDo[TResult](Func`1 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\DbConnector.cs:line 65 at Mendix.Modeler.Utility.DbConnectors.SQLiteConnector.Do[TResult](String filePath, Boolean useTransaction, Func`2 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 42 at Mendix.Modeler.Utility.DbConnectors.SQLiteConnector.Do(String filePath, Boolean useTransaction, Action`1 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\DbConnectors\SQLiteConnector.cs:line 25 at Mendix.Modeler.Storage.Mpr.MprLoader.LoadMpr(String filePath, IProgressInfo info, Boolean loadContents) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Storage\Mpr\MprLoader.cs:line 16 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Algorithm.MergeMprs(Boolean useNewContentsMergeAlgorithm, String baseFilePath, String headFilePath, String mineFilePath) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.MergeLib\UnitsAlgorithm\Algorithm.cs:line 19 at Mendix.Modeler.VersionControl.UpdateWorker.MergeProjectFile(RevCheckConflictState state) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Update\UpdateWorker.cs:line 102 at Mendix.Modeler.VersionControl.Updater.<>c_DisplayClass27_0.<AddMergeProjectFileStep>b_0(IProgressInfo info) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Update\Updater.cs:line 325 at Mendix.Modeler.VersionControl.Updater.<>c_DisplayClass31_0.<AddProcessStep>b_0(IProgressInfo info) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Update\Updater.cs:line 382 at Mendix.Modeler.Utility.Progress.Step.Run(IProgressInfo info) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Utility\Progress\Step.cs:line 22 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.RunStep(Step step) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 100 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.OnDoWork(Object sender, DoWorkEventArgs e) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 74 at System.ComponentModel.BackgroundWorker.OnDoWork(DoWorkEventArgs e) at System.ComponentModel.BackgroundWorker.WorkerThreadStart(Object argument) --- End of inner exception stack trace --- at Mendix.Modeler.UIFramework.Progress.ProcessRunner.Run() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 52 at Mendix.Modeler.UIFramework.Progress.ProgressUtil.Run(IProcess process) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.UIFramework\Progress\ProgressUtil.cs:line 15 at Mendix.Modeler.VersionControl.ProjectFileMergerUI.CheckProjectFileConflicted(IProject project) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\ProjectFileMergerUI.cs:line 75 at Mendix.Modeler.ProjectHandling.Openers.ProjectFileOpenerUI.AssertNoMergeConflicts() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\Openers\ProjectFileOpenerUI.cs:line 457 at Mendix.Modeler.ProjectHandling.Openers.ProjectFileOpenerUI.DoOpenProject() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\Openers\ProjectFileOpenerUI.cs:line 208 at Mendix.Modeler.ProjectHandling.Openers.ProjectFileOpenerUI.OpenProject() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\Openers\ProjectFileOpenerUI.cs:line 163 at Mendix.Modeler.ProjectHandling.Openers.ProjectOpenerUI.OpenFileProject(String projectFilePath) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\Openers\ProjectOpenerUI.cs:line 182 at Mendix.Modeler.ProjectHandling.Openers.ProjectOpenerUI.OpenOrImportProject(String projectPath) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\Openers\ProjectOpenerUI.cs:line 169 at Mendix.Modeler.ProjectHandling.CommandLine.CommandLineHandler.HandleCommandLineOptions() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.ProjectHandling\CommandLine\CommandLineHandler.cs:line 78 at Mendix.Modeler.Core.View.MainWindow.MainWindow.<Init>b__22_9(Object s, EventArgs e) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.Core.View.CrossPlatform\MainWindow\MainWindow.cs:line 119 at Eto.PropertyStore.TriggerEvent[T](Object key, Object sender, T args) at Eto.Forms.Control.OnShown(EventArgs e) at Eto.Forms.Control.Callback.OnShown(Control widget, EventArgs e) at Eto.Wpf.Forms.WpfWindow`3.<AttachEvent>b__36_6() at System.Windows.Threading.ExceptionWrapper.InternalRealCall(Delegate callback, Object args, Int32 numArgs) at System.Windows.Threading.ExceptionWrapper.TryCatchWhen(Object source, Delegate callback, Object args, Int32 numArgs, Delegate catchHandler) I’ve opened the MPR file with sql lite, and saw that this _MetaData table Exists, and the _ProductVersion, _BuildVersion and _SchemaHash are identical. 
asked
1 answers
0

A bit late, but you can work around the issue in the way you describe. You merge outside of Studio Pro with the Git command-line or a Git tool. This will indeed give you a conflicted project file (mpr). If you re-open the project, Studio Pro will detect this and do the merge of the model.

 

A colleague of mine is looking how you can get into this situation.

answered