Hi Diego,
You were right, my previous example I sent before stopped working for me as
well, and I were thrown back in the git svn rebase conflict loop again.
I have just tried another solution, based on the idea that the local master
and the local devel branch got separated early in the bioc mirr
Thanks Jesper for your reply.
I am afraid however thats what I did before (see the details of my
original message). The real problem is the file .Rbuildignore which
causes a rebase that then finds the conflict in DESCRIPTION (and other
files as I fix that one; I guess it is trying to go too far in
Hi Diego,
I had the same problem some days ago. Can't tell if this is the right way
to solve the problem, but it worked, and this is what I did,
1) modified the file under conflict, in your case DESCRIPTION.
2) git rebase --continue
3) git rebase --skip
#This is the selected output from my bash h
Dear all,
I am now having a similar issue (see bellow) with my other package
rTRM and so would like to bring the attention to this thread again.
Anyone using git mirrors experiencing something similar and/or knowing
how to fix it? Thank you very much in advance.
Best,
Diego
On Tue, Sep 8, 2015 a
