Provided that you have pushed all your changes, I think the easiest solution is to "remove" the commit in which you add the chksqr fix. You can do that with
git reset --hard c0b5c41d136013a8e2cd57f5bedd8c96f5d2e3c6 # the commit right before the chksqr changes git cherry-pick b7564f59ac0a8b72a4a86ccc73cb805520d820b7 git cherry-pick 021f766768b54686e60a75c023cb00ab0b38a5dc # the two commits after the chksqr git rebase origin/master # now without conflicts You can also just reset hard to https://github.com/andreasnoack/MixedModels.jl/tree/anj/glmms where I've made exactly these changes or I can open a PR with my version. On Tuesday, March 8, 2016 at 1:46:08 PM UTC-5, Douglas Bates wrote: > > Having looked closer (nothing like a public post to cause you to read > again and discover you were wrong) I see that I did change all those files > in the glmms branch that Andreas changed in his pull request. I hadfixed > the issue that Andreas addressed but in a different way and our changes > were in conflict. > > However, I am still in the position that I can't reconcile the glmms > branch and the master branch. >
