On 29 September 2016 at 01:47, Nelle Varoquaux <nelle.varoquaux@gmail.com> wrote:
On 28 September 2016 at 08:18, Andreas Mueller <t3kcit@gmail.com> wrote:
On 09/28/2016 10:05 AM, Gael Varoquaux wrote:
I am not against it. When I think about why I didn't use it, it was a combination of laziness and lack of trust in git (ie I was worried of hard-to-resolve conflicts).
Cool. I think we didn't run into any problems with it so far, and we have used it relatively extensively. I think it's a good default until we run into trouble. And once you use it, I think it becomes your default on github.
With squash and merge, there shouldn't be any problems ever. Rebasing onto mastre would be the tricky part.
+1. After Github confirms that something can be merged with the click of a button, there are generally no merge issues.
The only disadvantage is that you loose a lot of history on large PRs.