Skip to content

Commit 22d68ff

Browse files
committed
lint
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
1 parent 0831972 commit 22d68ff

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎internal/git/git.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ func (g *EnvironmentOperations) HasConflict(ctx context.Context, proposedBranch,
562562
// that keeps its tree and records both branch tips as parents. That commit establishes
563563
// the merge-base required by the subsequent pull request.
564564
//
565-
// NOTE: we're intentionally taking on the risk of blowing away someone's unrelated
565+
// NOTE: we're intentionally taking on the risk of blowing away someone's unrelated
566566
// proposed branch contents when adopted by Promoter. While that's always a possibility,
567567
// the likelihood that we're making a mistake is higher with two branches that don't
568568
// even share a history.

0 commit comments

Comments
 (0)