Fix pull-platformplatform-changes failing when local main is behind origin

Author: tjementum

developer-cli/Commands/PullPlatformPlatformChangesCommand.cs

@@ -106,6 +106,7 @@ private static void EnsureValidGitState()
 
         GitHelper.EnsureUpstreamRemoteExists(PlatformplatformGitPath);
         GitHelper.EnsureBranchIsUpToDate();
+        GitHelper.EnsureLocalBranchInSyncWithOrigin(TrunkBranchName);
     }
 
     private static Commit[] GetNewCommitsFromPlatformPlatform()
@@ -398,7 +399,7 @@ private static void PreparePullRequest(Commit[] pullrequestCommits)
         );
 
         var pullRequestDescription = body.ToString();
-        AnsiConsole.MarkupLine(pullRequestDescription);
+        AnsiConsole.MarkupLine(pullRequestDescription.EscapeMarkup());
         AnsiConsole.Confirm("Copy the above text as a description and use it for the pull request description. Continue?");
 
         GitHelper.PushBranch(PullRequestBranchName);

developer-cli/Utilities/GitHelper.cs

@@ -218,6 +218,18 @@ public static void PushBranch(string branchName)
         }
     }
 
+    public static void EnsureLocalBranchInSyncWithOrigin(string branchName)
+    {
+        var localHash = ProcessHelper.StartProcess($"git rev-parse {branchName}", Configuration.SourceCodeFolder, true).Trim();
+        var originHash = ProcessHelper.StartProcess($"git rev-parse {DefaultRemote}/{branchName}", Configuration.SourceCodeFolder, true).Trim();
+
+        if (localHash != originHash)
+        {
+            AnsiConsole.MarkupLine($"[red]Your local '{branchName}' branch is not in sync with '{DefaultRemote}/{branchName}'. Please pull or push changes before running this command.[/]");
+            Environment.Exit(1);
+        }
+    }
+
     public static int GetPullRequestNumber(Commit commit, string pattern)
     {
         var match = Regex.Match(commit.Message, pattern);