Hey All,
I would very much like if we used either rebase or squash workflow rather than merge. Aside from removing lots of merge commits it will also keep the history of the repo linear, which has the wonderful affect of making it easier to use git bisect to find problems when they leak in.
Additionally I think we should aim to squash PRs into a single commit unless there are explicit reasons for having the isolated changes
+1 for this.
Let's take this in CONTRIBUTING
Edit: Though if we practically can turn off the 'Merge' button isn't probably necessary :]
@LaRuaNa there is a setting in github for turning off the merge button. Although if we want to have policy around squashing commits that should be documented as well
@MylesBorins That sounds cool. I'm totally in favour of squashing commits. Adding this on wr-agenda
+1 for the squashed commits. Let's do it.
Merge button is now officially disabled. I'll leave this open for the redesign group to discuss, we can iterate and change defaults as neccessary
Most helpful comment
Merge button is now officially disabled. I'll leave this open for the redesign group to discuss, we can iterate and change defaults as neccessary