Skip to content

Commit

Permalink
Update docs/review_process.md
Browse files Browse the repository at this point in the history
Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
  • Loading branch information
prince-chrismc and jgsogo authored Jan 11, 2022
1 parent c920dec commit c3b9366
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/review_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Alternatively, just [open a new issue](https://github.com/conan-io/conan-center-

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.
It's recommended to [synchronize your branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to solve avoid conflicts.
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.

## Draft

Expand Down

0 comments on commit c3b9366

Please sign in to comment.