message no. 87657
Posted by Joric in #github at 2015-04-02T12:22:05Z
like, i merge 50 commits from master to a feature branch in a single commit (with --squash) then after a while I merge another 40 commits from master and get worse (larger) conflicts because of --squash