Hi!
I'm not sure I understand what actually the issue is, but:
On 2024-08-09T20:00:42+0200, Thomas Koenig <tkoe...@netcologne.de> wrote:
> I have managed to bring the fortran-unsigned branch into a state where
First, I see that the upstream devel/fortran_unsigned branch does contain
(a) your development work, and (b) a number of cherry-picks from trunk
branch. Do I understand correctly that (a) you want to keep, and (b) you
want to get rid of, via rebasing onto current trunk branch?
> it can no longer be rebased. When I do a
You say "can no longer be rebased", but:
> $ 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.
... this says "Successfully rebased" (and I'm reproducing that locally).
And, I see exactly your (a) set of commits remaining on my local branch,
on top of current trunk branch; all (b) commits have been weeded out
("warning: skipped previously applied commit [...]").
> 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
This is expected, as via the rebase, the common point of Git commit
history has "moved" (to current trunk branch).
> and when I do "git pull" I get a lot of conflicts, basically having
> to redo each commit by hand, as a conflict.
As others have said, too, that's expected, again for reason of the
rebase.
Is your issue that you first need to 'git pull' any missing commits from
upstream devel/fortran_unsigned branch into your local branch, and then
rebase on top of current trunk branch?
Otherwise, if you already have all relevant commits in your local branch
(check, as others have advised, with 'gitk' or plain 'git log', for
example), just '--force' push the local branch to upstream
devel/fortran_unsigned branch?
Grüße
Thomas
> 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
