Hi,
I have managed to bring the fortran-unsigned branch into a state where
it can no longer be rebased. When I do a
$ git rebase master
I get
...
warning: skipped previously applied commit a6399bb27b3
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/fortran_unsigned.
and
$ git status
On branch fortran_unsigned
Your branch and 'origin/devel/fortran_unsigned' have diverged,
and have 688 and 198 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
and when I do "git pull" I get a lot of conflicts, basically having
to redo each commit by hand, as a conflict.
I have no idea what happened, or why, and despite the help of some
nice people on #gcc I have not made any progress on how to resolve it.
Does anybody have any idea how to fix this?
If not, I will just have to abandon the devel branch and work locally.
Not that I want to, but I guess it's better than not doing anything...
Best regards
Thomas
