I have been building trunk builds for several projects for years and also bisected them to help with troubleshooting.
Over time I have noticed a pattern : some projects squash PRs into 1 commit, others merge the commits that make up the PR to master as individual commits .
The 2nd method makes troubleshooting much easier, but Oolite appears to use the first method.
Merge PR as multiple commits ?
Moderators: another_commander, winston
Merge PR as multiple commits ?
OS : Arch Linux 64-bit - rolling release
From: The Netherlands, Europe
OXPs : My user page (needs updating)
Retired, occasionally active
From: The Netherlands, Europe
OXPs : My user page (needs updating)
Retired, occasionally active
-
another_commander
- Quite Grand Sub-Admiral
- Posts: 7138
- Joined: Wed Feb 28, 2007 7:54 am
Re: Merge PR as multiple commits ?
We use both actually. PRs with a few, clear-cut commits can be merged as multi, while PRs consisting of many commits, especially when those are WIP ones with corrections, reverts etc., are merged squashed. Each PR is assessed individually regarding its merge method.
The idea is that when a PR gets merged, the commits inserted (and the resulting commit history) maintain a logical , easy to follow flow.
The idea is that when a PR gets merged, the commits inserted (and the resulting commit history) maintain a logical , easy to follow flow.