Am 09.08.24 um 21:57 schrieb Dimitar Dimitrov:
You are redoing the rebase again. So it is expected to get the same
warnings.
I need to get the changes from master into my branch, or else
things will not compile due to changes in master. But it seems
that this is no longer possible, thanks to git.
So, it seems I already pushed something dubious previously.
Yes, that seems to be the case.
Oh well... seems like it is possible, with something quite reasonable,
to hose up a branch. I thought that wasn't supposed to be possible in
git, and that ease of development with branches was the reason for
the git switchover. Oh well... is there a version control system
around which does not have as many traps for the casual user?
Any other ideas?
No, sorry. I thought that getting to a cleanly rebased tree would be
sufficient.
Unfortunately it's not.
Not so long ago, I pushed to that branch, which led to a looong time
for checking. It got there eventually, but I do not want to repeat
that (and with more than ~40 times the number of commits, too).
Is "checking" referring to regression testing of the development branch?
No, the checks that are run for a commit. That checking took quite a
few minutes. I think that, should I actually try to push my branch,
I might end up blocking other people's access to git for a considerably
longer time, so that is definitely out.
Unless somebody has any better ideas, I'll switch to a local branch.
This is not an experience I want to repeat.
Best regards (and thanks!)
Thomas
