fix(git): write back to custom git branch failed by rejected push: ti…

…p of your current branch is behind (#882)

Signed-off-by: Cheng Fang <[email protected]>

pkg/argocd/git.go

@@ -246,7 +246,7 @@ func commitChangesGit(app *v1alpha1.Application, wbc *WriteBackConfig, changeLis
 	if err != nil {
 		return err
 	}
-	err = gitC.Push("origin", pushBranch, false)
+	err = gitC.Push("origin", pushBranch, pushBranch != checkOutBranch)
 	if err != nil {
 		return err
 	}