hi,
Please answer the following questions to help us understand your issue.
Disclaimer: this is not a bug report per-se but a feature request!
What did you do before the bug happened? (Steps to reproduce your issue)
git rebase main
What did you expect to happen? (Expected behavior)
all fine, it just would be very useful if git would issue some more
information (see below).
What happened instead? (Actual behavior)
a fictitious example of the output from the merge command is as follows:
Auto-merging x/y.z
CONFLICT (content): Merge conflict in x/y.z
Auto-merging a/b.c
CONFLICT (content): Merge conflict in a/b.c
error: could not apply 9cd549b33... start with initial status,
update some refs
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase
--continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run
"git rebase --abort".
Could not apply 9cd549b33... start with initial status, update some
refs
What's different between what you expected and what actually happened?
a very useful output before the lines above would be:
Rebasing branches:
--ours = "main"
--theirs = "my_great_feature_branch"
and vice-versa when doing a "git merge main" ie
Merging branches:
--ours = "my_great_feature_branch"
--theirs = "main"
this helps greatly in the otherwise confusing choice of command-line
options when trying to keep one of the versions intact:
git checkout (--ours|--theirs) -- x/y.z
[System Info]
git version:
git version 2.43.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 6.8.0-79-generic #79-Ubuntu SMP PREEMPT_DYNAMIC Tue Aug 12
14:42:46 UTC 2025 x86_64
compiler info: gnuc: 13.3
libc info: glibc: 2.39
$SHELL (typically, interactive shell): /bin/bash
[Enabled Hooks]
--
darko.
dr darko veberic 大口 ~~~~~~~~~~~~~~~~~~~
karlsruhe institute of technology (kit)
institute for astroparticle physics (iap)
campus nord 425, postfach 3640
76021 karlsruhe, germany
mobile: +49 151 5600 7386
office: +49 721 608 24704
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
