Branch to Main Line merge issue

0
Hi All, We are trying to merge the branch line we made going back to Main Line.  Anyone experienced this issue below on merging branch with Main Line on Mendix? As much as possible we dont want to overwrite the Main Line.     SharpSvn.SvnSystemException: Error running context: An existing connection was forcibly closed by the remote host.      at SharpSvn.SvnClientArgs.HandleResult(SvnClientContext client, SvnException error, Object targets)    at SharpSvn.SvnClient.Merge[TRevisionRange](String targetPath, SvnTarget source, ICollection`1 mergeRange, SvnMergeArgs args)    at SharpSvn.SvnClient.Merge(String targetPath, SvnTarget source, SvnRevisionRange mergeRange, SvnMergeArgs args)    at Mendix.Modeler.VersionControl.SvnClientAdapter.Merge(String targetPath, SvnTarget source, SvnRevisionRange mergeRange, SvnMergeArgs args) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Svn\SvnClientAdapter.cs:line 142    at Mendix.Modeler.VersionControl.Windows.SvnConnector.<>c__DisplayClass28_0.<Merge>b__0(ISvnClient c) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 316    at Mendix.Modeler.VersionControl.Windows.SvnConnector.PathClientDo(String workingCopyPath, Action`1 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 339    at Mendix.Modeler.VersionControl.Windows.SvnConnector.Merge(String projectDir, IRemoteRepository remoteRepository, IRevLine sourceBranchLine, SvnRevisionRange revisionRange, SvnMergeArgs mergeArgs) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 316    at Mendix.Modeler.VersionControl.Operations.Svn.SvnMergeOperation.SvnMerge(MergeRequest updateRequest, SvnMergeState svnMergeState, String projectDir) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Operations\Svn\SvnMergeOperation.cs:line 73    at Mendix.Modeler.VersionControl.Operations.Svn.SvnMergeOperation.Execute(MergeRequest updateRequest) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Operations\Svn\SvnMergeOperation.cs:line 42        
asked
1 answers
0

I expect that this is an issue on the svn side and most of the times this will fix itself, so wait and try again.

If this doesn’t work then create a ticket with mendix support for this issue.

answered