unknown
1970-01-01 00:00:00 UTC
--001a11c372bed6750f0501c73b5f
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable <div dir="ltr">@dregard is probably right. ?I think rebase will be harder, but merge shouldn't. ?I also prefer not squashing the changes. ?So normal merge is the plan.<div><br></div><div>@atrol I've reviewed a couple of pull requests that I was missing.</div> </div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 28, 2014 at 1:56 AM, Damien Regad <span dir="ltr"><<a href="mailto:***@mantisbt.org" target="_blank">***@mantisbt.org</a>></span> wrote:<br> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="">>> Victor Boctor <<a href="mailto:***@mantishub.net">***@mantishub.net</a>> hat am 28. August 2014 um 05:26<br>
>> geschrieben:<br> </div><div class="">>> - Squash all your changes into a new branch, then try merging with that. That<br>
>> will remove the spacing issue. I wonder if having the early commits with<br>
>> these changes would cause more conflicts compared to the squashed changes<br>
>> which reverted these spaces manually.<br> <br> </div>>
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable <div dir="ltr">@dregard is probably right. ?I think rebase will be harder, but merge shouldn't. ?I also prefer not squashing the changes. ?So normal merge is the plan.<div><br></div><div>@atrol I've reviewed a couple of pull requests that I was missing.</div> </div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 28, 2014 at 1:56 AM, Damien Regad <span dir="ltr"><<a href="mailto:***@mantisbt.org" target="_blank">***@mantisbt.org</a>></span> wrote:<br> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="">>> Victor Boctor <<a href="mailto:***@mantishub.net">***@mantishub.net</a>> hat am 28. August 2014 um 05:26<br>
>> geschrieben:<br> </div><div class="">>> - Squash all your changes into a new branch, then try merging with that. That<br>
>> will remove the spacing issue. I wonder if having the early commits with<br>
>> these changes would cause more conflicts compared to the squashed changes<br>
>> which reverted these spaces manually.<br> <br> </div>>