githubFeature
diff --git a/‎git/git.go‎
Lines changed: 5 additions & 1 deletion b/‎git/git.go‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎pkg/cmd/pr/merge/merge.go‎
Lines changed: 3 additions & 4 deletions b/‎pkg/cmd/pr/merge/merge.go‎
Lines changed: 3 additions & 4 deletions
@@ -181,7 +181,11 @@ func Commits(baseRef, headRef string) ([]*Commit, error) {
 }
 
 func LastCommit() (*Commit, error) {
-	logCmd := GitCommand("-c", "log.ShowSignature=false", "log", "--pretty=format:%H,%s", "-1")
+	logCmd, err := GitCommand("-c", "log.ShowSignature=false", "log", "--pretty=format:%H,%s", "-1")
+	if err != nil {
+		return nil, err
+	}
+
 	output, err := run.PrepareCmd(logCmd).Output()
 	if err != nil {
 		return nil, err
 
@@ -131,13 +131,12 @@ func mergeRun(opts *MergeOptions) error {
 		return err
 	}
 
-	localBranchName, err := git.CurrentBranch()
-	if err == nil {
+	if opts.SelectorArg == "" {
 		localBranchLastCommit, err := git.LastCommit()
 		if err == nil {
-			if localBranchName == pr.HeadRefName && localBranchLastCommit.Sha != pr.Commits.Nodes[0].Commit.Oid {
+			if localBranchLastCommit.Sha != pr.Commits.Nodes[0].Commit.Oid {
 				fmt.Fprintf(opts.IO.ErrOut,
-					"%s Pull request #%d (%s) may have a last commit that is different from local one\n", utils.Yellow("!"), pr.Number, pr.Title)
+					"%s Pull request #%d (%s) has diverged from local branch\n", cs.Yellow("!"), pr.Number, pr.Title)
 			}
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,12 @@ func mergeRun(opts *MergeOptions) error {`
`131`	`131`	`return err`
`132`	`132`	`}`
`133`	`133`
`134`		`- localBranchName, err := git.CurrentBranch()`
`135`		`- if err == nil {`
	`134`	`+ if opts.SelectorArg == "" {`
`136`	`135`	`localBranchLastCommit, err := git.LastCommit()`
`137`	`136`	`if err == nil {`
`138`		`- if localBranchName == pr.HeadRefName && localBranchLastCommit.Sha != pr.Commits.Nodes[0].Commit.Oid {`
	`137`	`+ if localBranchLastCommit.Sha != pr.Commits.Nodes[0].Commit.Oid {`
`139`	`138`	`fmt.Fprintf(opts.IO.ErrOut,`
`140`		`- "%s Pull request #%d (%s) may have a last commit that is different from local one\n", utils.Yellow("!"), pr.Number, pr.Title)`
	`139`	`+ "%s Pull request #%d (%s) has diverged from local branch\n", cs.Yellow("!"), pr.Number, pr.Title)`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`	`}`