search

FightPandemics / FightPandemics

This is not the first and last pandemic. Currently, the information about the pandemic is highly fragmented, especially at the local level. Whereas one can find global information and trackers, it is difficult to find information that is relevant to your community. Furthermore, it is difficult for organizations, funders, companies, volunteers and local leaders to coordinate responses. This puts humanity and local communities at risk. FightPandemics was born to make communities more resilient to pandemics by facilitating access to information and coordinated responses.
MIT License
110 stars 141 forks source link

Convention for git commits & pull requests #758

Open joshmorel opened 4 years ago

joshmorel commented 4 years ago

Some things to include:

joshmorel commented 4 years ago

I had originally planned to do this one but it turned out to be a little more nuanced then I had initially thought #441

My Original Comment:

Add reviewers to PR
2 must approve to merge into master
The reviewer making the 2nd approval should merge immediately into master if:
    There are no un-resolved changes requested by other reviewers
    There is merge conflict due to recent commits to master - the reviewer can resolve if they feel they can confidently do so OR ask the requester to resolve and complete the merge

At their discretion, repo admins can merge small or urgent changes without the 2 required approvals.

The thing that is not quite so clear cut - The reviewer making the 2nd approval should merge immediately into master if - it does kind of depend. Sometimes 2nd approval can approve and make optional suggestion for author to implement if they feel like it.

But generally:

  1. Two approvals are required to merge into master
  2. All reviewer change requests should be resolved before merging
  3. Merge does not need to be completed by the author, the 2nd approving reviewer can merge into master if no pending change requests or ask author to complete (e.g. if there are optional suggestions for the author to implement at their discretion)
  4. At their discretion, repo admin can merge small or urgent changes without the 2 required approvals
tejasm2 commented 4 years ago

Is this resolved @idjevm @joshmorel ?