search

PineappleStudios / Super-Pong

Testing out Unity/Git
2 stars 0 forks source link

Dev process for pull requests #23

Open Ghoublai-Khan opened 7 years ago

Ghoublai-Khan commented 7 years ago

How do we want to handle merging pull requests? Two +1s is what I'm sort of used to but we could do everyone +1s.

Ghoublai-Khan commented 7 years ago

Related how do we want to merge: squashed, rebased squash, merge whatever commits you have on the branch? I'm absolutely for only enabling rebased merges because merge commits are annoying and the commit graph looks incrediblely terrible if you use merge commits. The merge portion of the commit doesn't really tell you much anyways.

This would be changing what the merge button on pull requests does for this repo. You could still click the merge button for those that only use GUIs

dg1432 commented 7 years ago

That sounds good to me.

atb-brown commented 7 years ago

We'll try to use common sense when it comes to pull requests. If it's a really big task (not necessarily by lines of code, but by complexity), then we can say we can wait for everyone to +1.

For smaller tasks, I'm fine with two +1's. Hopefully more people will be engaged, but if we get two +1's, then we can merge it into stable.

For stable -> master merges, let's say that everyone needs to +1.