Pull Request on GitHub

[rogerxu]

• [x] Deal with large changes in a pull request
• [x] Force push
• [x] Rebase
• [ ] Cherry-pick
• [x] Squash
• [x] Backend + frontend code in same feature branch or separate ones?
• [x] Resolve merge conflicts

[rogerxu]

Deal with large changes in a pull request

GitHub supports progressively loaded diffs in Pull Request since Dec 2016..

How we made diff pages three times faster - GitHub Engineering

[rogerxu]

Force push

Can a contributor force update the feature branch which will overwrite commits pushed by others?

Yes. The contributor can do force push on a feature branch. Then the Pull Request will be updated and retrigger the checks.

[rogerxu]

Rebase

Can a contributor rebase the feature branch on the master branch?

GitHub supports rebase merge in Pull Request since Sept 2016.

Rebase and merge pull requests

[rogerxu]

Cherry-pick

[rogerxu]

Squash

GitHub supports squash merge in Pull Request since Apr 2016.

Squash your commits

[rogerxu]

Backend + frontend code in same feature branch or separate ones?

Ideal they should be in same feature branch. But if there are limitations on the technology then you can use separated branches.

[rogerxu]

Resolve merge conflicts

GitHub supports resolve simple merge conflicts since Dec 2016.

Resolve simple merge conflicts on GitHub