Commit Graph

3 Commits

Author SHA1 Message Date
Adrin Jalali 468c3f4057
MNT replace master with main (#19237)
* replace master with main

* fix imbalanced-learn

Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com>

* asv default branch is `master`

Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>

Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com>
Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>
2021-01-22 15:19:48 +01:00
Joel Nothman 1cc346cece BUILD Give clear error message when there are merge conflicts (#8945) 2017-05-29 13:42:47 +02:00
jakirkham 5d6460de28 MNT/BLD Use GitHub's merge refs to test PRs on CircleCI (#8211)
Unlike other CIs, CircleCI does not test the merge commit of a PR with
its base branch. Instead it tests the PR's head commit. The problem with
this is the PR's status could differ when it is merged with the base
branch. For instance, if one needs changes in the base branch to get
their PR to pass, they must rebase/merge to get them into the history
the PR. This normally isn't a problem, but sometimes things do go wrong
when doing this merge/rebase, which adds a new unneeded difficulty.
Alternatively, a passing PR could turn out to fail when merged into the
base branch because some new content in the base branch was not tested
against in the PR.

To solve these issues, we checkout the merge ref for a PR (if it is a
PR) from GitHub. However, it should be noted that the merge ref can be
out-of-date in some cases w.r.t. the base branch. Still this is the
commonly used strategy on Travis CI and AppVeyor. If we had enough info,
we could ideally terminate a build that has merge conflicts.
Unfortunately it doesn't seem that CircleCI gives us this info.
2017-01-18 02:45:37 +01:00