Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let contributors know to avoid rebasing #8797

Merged
merged 3 commits into from
Jan 12, 2022
Merged

Let contributors know to avoid rebasing #8797

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c920dec
Let contributors know to avoid rebasing
prince-chrismc Jan 10, 2022
c3b9366
Update docs/review_process.md
prince-chrismc Jan 11, 2022
de5c694
Update review_process.md
prince-chrismc Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions docs/review_process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ Alternatively, just [open a new issue](https://github.com/conan-io/conan-center-

## Avoiding conflicts

It's recommended to rebase your changes on top of the master branch to avoid conflicts.
Right now, neither GitHub itself nor conan-center-bot notify about merge conflicts, so it's the contributor's responsibility to periodically check for the conflicts.
Obviously, PRs that have merge conflicts are never merged, and all the conflicts have to be resolved first.
Right now, neither GitHub itself nor conan-center-bot notify about merge conflicts, so it's the contributor's responsibility to periodically check for the conflicts. Pull Requests that have merge conflicts are never merged, and all the conflicts have to be resolved first.

Please [synchronize your branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to take into account the latest changes in the main branch. This is importatnt for ConanCenter to ensure it is building the correct recipe revision, see [this comment](https://github.com/conan-io/conan-center-index/pull/8797#discussion_r781993233) for details. One trick is to look out for comments from the [Community's Conflict PR Bot](https://github.com/prince-chrismc/conan-center-index/blob/patch-41/docs/community_resources.md#bots) which can alter you to possible problems.

## Draft

Expand Down Expand Up @@ -136,6 +136,8 @@ PR is selected for the merge only if:

If these conditions are fulfilled, the PR is merged (associated issues are automatically closed), and then the build of master is launched.

The conan-center-bot will perform a [squash and merge](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-pull-request-commits). This means should do not need to rebase your pull request; doing so will dismiss any reviews and the reviewer will need to restart.

### Merge

After merging a pull request, if an actual merge happened (for instance, the recipe changed in PR was already updated in master by the time PR merged),
Expand Down