Code synchronization (bc43c541) · Commits · Eclipse Projects / SKyBT / Libraries

Common/Common/Utilities/Handler/Git/GitProcessor.cs

+4 −1

Original line number	Diff line number	Diff line
		@@ -576,9 +576,13 @@ public class GitProcessor
		if ( !FetchAll( "upstream" ) )
		return false;

		if ( !Checkout( "main" ) )
		return false;

		if ( !Merge( CheckoutFileConflictStrategy.Theirs, true ) )
		return false;


		if ( !Push( "main", "Upstream synchronization", force: true ) )
		return false;

		@@ -604,6 +608,5 @@ public class GitProcessor
		return result;
		}


		#endregion Services
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,8 @@ public class GitNotificationContent : NotificationContentBase
		new( CConst.CIs[1], NotificationType.Error, "Fehler beim Zusammenführen von lokalen Änderungen!" )] );
		Add( Error + 0000090, [new( CConst.CIs[0], NotificationType.Error, "Error committing local changes to the remote repository!", true ),
		new( CConst.CIs[1], NotificationType.Error, "Fehler beim Übertragen lokaler Änderungen in das remote repository!" )] );
		Add( Error + 0000100, [new( CConst.CIs[0], NotificationType.Error, "Errors in upstream synchronization (e.g. remote original -> remote fork)!", true ),
		new( CConst.CIs[1], NotificationType.Error, "Fehler bei der Upstream-Synchronisation (z.B. Remote-Original -> Remote-Fork)!" )] );
		Add( Error + 0000100, [new( CConst.CIs[0], NotificationType.Error, "Error during upstream synchronization between remote-original- and remote-fork-branches!", true ),
		new( CConst.CIs[1], NotificationType.Error, "Fehler beim Upstream-Sync. zwischen Remote-Original und Remote-Fork-Branches!" )] );

		#endregion Error (5xxxxxxx)