On 09/05/2015 17:40, Marvin Humphrey wrote:
If you agree with these modificationss, we can either make them now or in a new commit after you finish the big merge. I'm wary of cascading changes when rebasing large branches with lots of conflicts.
+1 I merged the branch as-is. Let's make further modifications in a new commit. Nick
