20 Aug
2014
20 Aug
'14
12:34 p.m.
On 20/08/14 03:18, Gavin Lambert wrote:
One case where it's a bit trickier to define the "right thing" is with pull requests.
For me it makes sense to merge pull requests rather than rebase them. They're usually a set of commits that fix a bug or implement a new feature, and are strongly correlated. It's different from the random merges you get in the "pull before push" scenario.