Re: Difficulties using git rebase. Help, please!
- From
- Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
- Date
- Jan 12, 2026, 16:08 UTC
- Message-ID
- <fefb3d25-3723-4e10-893a-620fbdc0cc45@app.fastmail.com>
- In-Reply-To
- <aWPFxQloyfx8x0ED@MAC.fritz.box>
On Sun, Jan 11, 2026, at 16:46, Alan Mackenzie wrote:
Show 17 quoted lines
>[snip] > $ git rebase --onto master origin/linux-6.13.y HEAD > > .. This didn't work well. In particular, I got a conflict in a file that > I had never changed. Why? > > Well, I corrected the conflicts in that file, git add'ed it, git rebase > --continue'd, then got another conflict in a file I'd never touched. > Same again. After the third such conflict, I gave up with git rebase > --abort. > > Criticism: there doesn't appear to be a --dry-run option in git rebase, > with which one can see how many files will be conflicted. Instead they > are notified one at a time, drip, drip, drip, .... to the user. In my > case there might have been four conflicted files, there might have been a > thousand. Either I'm missing something, or git rebase is missing > something, hopefully the former.
Just a dry-run? I would use `git merge-tree HEAD origin/linux-6.13.y`. Then you get to see what files are conflicted without stepping through anything.
>[snip]