I have a glmms branch in the MixedModels package repository,
https://github.com/dmbates/MixedModels.jl
After having forked the branch I merged a pull request from Andreas into
the master branch of the repository. My understanding is that I should be
able to rebase the glmms branch to the updated master branch. git
disagrees and sends me into one of those "you can't do this until you do
that and you can't do that until you do this" loops.
My usual response at this point is to swear a lot and start over from
scratch removing my local repository, deleting the glmms branch on github,
creating the branch again and inserting my changes by hand. I'm fairly
certain this is not the recommended approach.
There is exactly one line of conflict in the changes from the pull request
and the changes in the glmms branch up until now.
I had hoped that
Pkg.checkout("MixedModels", "glmms")
then switching to the shell and running
git rebase master
would rebase my glmms branch on to the current master and probably ask me
to reconcile the one line in conflict. But it doesn't. All the
auto-merging of changes in master result in conflicts even though none of
those files were changed in the glmms branch after it was forked.
Can someone please advise me?
