Merge pull request #13655 from carlocab/pr-conflict-fix

pr-pull: fix PRs conflicting with themselves
Homebrew · Aug 5, 2022 · ff9c250 · ff9c250
2 parents d4ddfb8 + a829749
commit ff9c250
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb
@@ -373,6 +373,8 @@ def pr_check_conflicts(user, repo, pr)
       "org:#{user}", repo: repo, state: "open", label: "\"no long build conflict\""
     ).each_with_object({}) do |long_build_pr, hash|
       number = long_build_pr["number"]
+      next if number == pr.to_i
+
       GitHub.get_pull_request_changed_files("#{user}/#{repo}", number).each do |file|
         key = file["filename"]
         hash[key] ||= []