Odd Git/Merge Error Mendix Client Breaking when merging after moving to 11.12.1
0
Our team is having an issue when trying to merge back to the parent lineMendix studio will say there are "conflicts" but the Changes tab won't show any changes The only change will be into the "project file" Also mendix Studi will Error out. :System.InvalidOperationException: Objects with ID 9fb2c54e-6ce8-4a08-bf7f-3f4f18b7c39f of type DomainModels$IndexedAttribute do not have the same properties. baseNames = Ascending, AttributePointer, Type; newNames = Ascending, AssociationPointer, AttributePointer, Type at Mendix.Modeler.MergeLib.ContentsAlgorithmNewStyle.DifferenceComputer.CompareObjects(MprObject baseObject, MprObject newObject) in Mendix.Modeler.MergeLib\ContentsAlgorithmNewStyle\DifferenceComputer.cs:line 48 at Mendix.Modeler.MergeLib.ContentsAlgorithmNewStyle.DifferenceComputer.ComputeDifferences() in Mendix.Modeler.MergeLib\ContentsAlgorithmNewStyle\DifferenceComputer.cs:line 32 at Mendix.Modeler.MergeLib.ContentsAlgorithmNewStyle.MergeAlgorithm.MergeContents(Dictionary`2 baseDictionary, MprObject headContents, MprObject mineContents) in Mendix.Modeler.MergeLib\ContentsAlgorithmNewStyle\MergeAlgorithm.cs:line 43 at Mendix.Modeler.MergeLib.ContentsAlgorithmNewStyle.MergeAlgorithm.MergeContents(MprObject baseContents, MprObject headContents, MprObject mineContents) in Mendix.Modeler.MergeLib\ContentsAlgorithmNewStyle\MergeAlgorithm.cs:line 33 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.MergeContents(Guid unitID) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 122 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.ApplyMergeItem(MergeItem item) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 93 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.<ApplyMerge>b__11_2(IMprHandle handle3) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 65 at Mendix.Modeler.Storage.Mpr.MprRepository.<>c__DisplayClass18_0.<DoWithMprHandle>b__0(IMprStorageService mprStorageService) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 212 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.<>c__DisplayClass10_0.<Do>b__0(IMprStorageService s) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 94 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.PerformAction[T](String mprFilePath, Func`2 action, IMprStorageService mprStorageService, IDbConnector connector, String loggingId) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 235 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action, Boolean doCheckForV2, Boolean readOnly) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 170 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 109 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do(String mprFilePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 90 at Mendix.Modeler.Storage.Mpr.MprRepository.DoWithMprHandle(String filePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 207 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.<ApplyMerge>b__11_1(IMprHandle handle2) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 58 at Mendix.Modeler.Storage.Mpr.MprRepository.<>c__DisplayClass18_0.<DoWithMprHandle>b__0(IMprStorageService mprStorageService) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 212 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.<>c__DisplayClass10_0.<Do>b__0(IMprStorageService s) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 94 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.PerformAction[T](String mprFilePath, Func`2 action, IMprStorageService mprStorageService, IDbConnector connector, String loggingId) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 235 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action, Boolean doCheckForV2, Boolean readOnly) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 170 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 109 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do(String mprFilePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 90 at Mendix.Modeler.Storage.Mpr.MprRepository.DoWithMprHandle(String filePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 207 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.<ApplyMerge>b__11_0(IMprHandle handle) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 53 at Mendix.Modeler.Storage.Mpr.MprRepository.<>c__DisplayClass18_0.<DoWithMprHandle>b__0(IMprStorageService mprStorageService) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 212 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.<>c__DisplayClass10_0.<Do>b__0(IMprStorageService s) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 94 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.PerformAction[T](String mprFilePath, Func`2 action, IMprStorageService mprStorageService, IDbConnector connector, String loggingId) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 235 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action, Boolean doCheckForV2, Boolean readOnly) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 170 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do[T](String mprFilePath, Func`2 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 109 at Mendix.Modeler.Storage.Mpr.Storage.MprStorageManager.Do(String mprFilePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\Storage\MprStorageManager.cs:line 90 at Mendix.Modeler.Storage.Mpr.MprRepository.DoWithMprHandle(String filePath, Action`1 action) in Mendix.Modeler.Storage\Mpr\MprRepository.cs:line 207 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Applier.ApplyMerge() in Mendix.Modeler.MergeLib\UnitsAlgorithm\Applier.cs:line 48 at Mendix.Modeler.MergeLib.UnitsAlgorithm.Algorithm.MergeMprs(String baseFilePath, String headFilePath, String mineFilePath) in Mendix.Modeler.MergeLib\UnitsAlgorithm\Algorithm.cs:line 43 at Mendix.Modeler.VersionControl.Update.UpdateWorker.MergeProjectFile(RevCheckConflictState state) in Mendix.Modeler.VersionControl\Update\UpdateWorker.cs:line 99 at Mendix.Modeler.VersionControl.Commit.Steps.MergeProjectFileStep.<>c__DisplayClass0_0.<Add>b__0(IProgressInfo _) in Mendix.Modeler.VersionControl\Commit\Steps\MergeProjectFileStep.cs:line 15 at Mendix.Modeler.VersionControl.Commit.Steps.MergeProcessStep.<>c__DisplayClass0_0.<AddProcessStep>b__0(IProgressInfo info) in Mendix.Modeler.VersionControl\Commit\Steps\MergeProcessStep.cs:line 17 at Mendix.Modeler.Utility.Progress.StepBase`1.Run(TProgressInfo info) in Mendix.Modeler.Utility\Progress\Step.cs:line 32 at Mendix.Modeler.Utility.Progress.StepBase`1.Mendix.Modeler.Utility.Progress.IStep.Run(Object progressInfo) in Mendix.Modeler.Utility\Progress\Step.cs:line 37 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.RunStep(IStep step) in Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 240 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.OnDoWork(Object sender, DoWorkEventArgs e) in Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 157 at Mendix.Modeler.Undo.UndoDelegatingBackgroundWorker.OnDoWork(DoWorkEventArgs e) in Mendix.Modeler.Undo\UndoDelegatingBackgroundWorker.cs:line 22 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 108 at Mendix.Modeler.VersionControl.View.Merge.MergeController.DoMerge(IProject project, IMergeState state) in Mendix.Modeler.VersionControl.View\Merge\MergeController.cs:line 131 at Mendix.Modeler.VersionControl.View.Merge.MergeController.DoMergeWithTypeInteractively(IProject project, MergeType mergeType, Option`1 preSelectedCommit) in Mendix.Modeler.VersionControl.View\Merge\MergeController.cs:line 59 at Mendix.Modeler.VersionControl.View.Merge.MergeController.MergeInteractively(IProject project) in Mendix.Modeler.VersionControl.View\Merge\MergeController.cs:line 40 at Mendix.Modeler.ProjectHandling.View.Commands.VersionControl.MergeChangesCommand.CallToResult(IFeatureCommandContext context) in Mendix.Modeler.ProjectHandling.View\Commands\VersionControl\MergeChangesCommand.cs:line 27 at FeatureCommand`1.Execute(IFeatureCommandContext context) in Mendix.Modeler.Core\Commands\Values\FeatureCommandWithResult.cs:line 50 at Mendix.Modeler.ProjectHandling.View.Menus.VersionControlMenuItemsProvider.<>c__DisplayClass4_0.<MakeCommandHandler>b__0() in Mendix.Modeler.ProjectHandling.View\Menus\VersionControlMenuItemsProvider.cs:line 61 at Eto.Forms.RelayCommand.<>c__DisplayClass0_0.<.ctor>b__0(Object obj) at Eto.Forms.RelayCommand`1.Execute(Object parameter) at Eto.PropertyStore.CommandWrapper.Command_Execute(Object sender, EventArgs e) at Eto.Forms.Command.OnExecuted(EventArgs e) at Mendix.Modeler.Controls.Menus.AsyncInvokedCommand.<>n__0(EventArgs e) at Mendix.Modeler.Controls.Menus.AsyncInvokedCommand.<>c__DisplayClass2_0.<OnExecuted>b__0() in Mendix.Modeler.Controls\Menus\MenuItemViewModel.cs:line 192 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)Any Suggestions or Ideas ?
asked
Miguel Arturo Palomares Ruiz
2 answers
0
Hi Miguel,
I am also facing this issue with 11.12.1.
For this part "Mendix studio will say there are "conflicts" but the Changes tab won't show any changes", closing Studio Pro and opening it again should fix it. Once you open Studio Pro again, conflicts are suddently gone.
At least this has been the "workaround fix" for us, while there is no permanent fix.
Hope this fixes it.
Best regards,
João
answered
João Lopes
0
This is the error when trying to re-open mendix studio pro during the merge