Thanks, Andreas. Unfortunately, I am still in trouble. Sorry to be such a PITA.
When I apply those changes that you describe it is okay until I try to push the changes. The response I get is that I can't push to origin/glmms because the branches have diverged. $ git status On branch glmms Your branch and 'origin/glmms' have diverged, and have 11 and 6 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working directory clean bates@thin40:~/.julia/v0.4/MixedModels$ git pull Auto-merging src/paramlowertriangular.jl CONFLICT (content): Merge conflict in src/paramlowertriangular.jl Auto-merging src/logdet.jl CONFLICT (content): Merge conflict in src/logdet.jl Auto-merging src/linalg.jl CONFLICT (content): Merge conflict in src/linalg.jl Auto-merging src/inject.jl CONFLICT (content): Merge conflict in src/inject.jl Auto-merging src/inflate.jl CONFLICT (content): Merge conflict in src/inflate.jl Auto-merging src/cfactor.jl CONFLICT (content): Merge conflict in src/cfactor.jl Auto-merging src/bootstrap.jl CONFLICT (content): Merge conflict in src/bootstrap.jl Auto-merging src/MixedModels.jl CONFLICT (content): Merge conflict in src/MixedModels.jl Auto-merging src/GLMM/PIRLS.jl CONFLICT (content): Merge conflict in src/GLMM/PIRLS.jl Automatic merge failed; fix conflicts and then commit the result. On Tuesday, March 8, 2016 at 2:29:08 PM UTC-6, Andreas Noack wrote: > > 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. >> >
