Skip to content

Conversation

@Borda
Copy link
Collaborator

@Borda Borda commented Jan 10, 2021

What does this PR do?

label PR which has a conflict with the target branch
see some alternatives:

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified
  • Check that target branch and milestone match!

Did you have fun?

Make sure you had fun coding 🙃

@Borda Borda added feature Is an improvement or enhancement productivity labels Jan 10, 2021
@Borda Borda added this to the 1.1.x milestone Jan 10, 2021
@Borda Borda requested a review from tchaton as a code owner January 10, 2021 18:52
@codecov
Copy link

codecov bot commented Jan 10, 2021

Codecov Report

Merging #5450 (6fcc36c) into master (bb5031b) will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #5450   +/-   ##
======================================
  Coverage      93%     93%           
======================================
  Files         135     135           
  Lines       10011   10011           
======================================
  Hits         9328    9328           
  Misses        683     683           

@Borda Borda self-assigned this Jan 10, 2021
@Borda Borda added the ready PRs ready to be merged label Jan 10, 2021
@Borda Borda enabled auto-merge (squash) January 10, 2021 19:56
@Borda Borda merged commit f1e28d1 into master Jan 10, 2021
@Borda Borda deleted the ci/label-conflicts branch January 10, 2021 20:33
@rohitgr7
Copy link
Contributor

SeanNaren pushed a commit that referenced this pull request Jan 12, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
SeanNaren pushed a commit that referenced this pull request Jan 12, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
SeanNaren pushed a commit that referenced this pull request Jan 13, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
SeanNaren pushed a commit that referenced this pull request Jan 13, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
SeanNaren pushed a commit that referenced this pull request Jan 19, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Borda added a commit that referenced this pull request Jan 23, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Borda added a commit that referenced this pull request Jan 25, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Borda added a commit that referenced this pull request Jan 26, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Borda added a commit that referenced this pull request Jan 26, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Borda added a commit that referenced this pull request Jan 26, 2021
* GH action - label conflicts

* .

* trigger

* trigger

* .

(cherry picked from commit f1e28d1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature Is an improvement or enhancement ready PRs ready to be merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants