{"thread":{"id":"64137","subject":"git merge/rebase feature request","startedAt":"2025-09-12T16:29:55Z","lastAt":"2025-09-12T16:29:55Z","messageCount":1,"participants":["Darko Veberic"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"526203","messageId":"874521b6-8311-467e-b49e-44124154b5b6@kit.edu","threadId":"64137","inReplyTo":null,"subject":"git merge/rebase feature request","fromName":"Darko Veberic","fromEmail":"darko.veberic@kit.edu","sentAt":"2025-09-12T16:14:34Z","receivedAt":"2025-09-12T16:29:55Z","isPatch":false,"sender":{"key":"darko.veberic@kit.edu","avatar":null},"body":"hi,\n\nPlease answer the following questions to help us understand your issue.\n\n   Disclaimer: this is not a bug report per-se but a feature request!\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\n   git rebase main\n\nWhat did you expect to happen? (Expected behavior)\n\n   all fine, it just would be very useful if git would issue some more \ninformation (see below).\n\nWhat happened instead? (Actual behavior)\n\n   a fictitious example of the output from the merge command is as follows:\n\n     Auto-merging x/y.z\n     CONFLICT (content): Merge conflict in x/y.z\n     Auto-merging a/b.c\n     CONFLICT (content): Merge conflict in a/b.c\n     error: could not apply 9cd549b33... start with initial status, \nupdate some refs\n     hint: Resolve all conflicts manually, mark them as resolved with\n     hint: \"git add/rm <conflicted_files>\", then run \"git rebase \n--continue\".\n     hint: You can instead skip this commit: run \"git rebase --skip\".\n     hint: To abort and get back to the state before \"git rebase\", run \n\"git rebase --abort\".\n     Could not apply 9cd549b33... start with initial status, update some \nrefs\n\nWhat's different between what you expected and what actually happened?\n\n   a very useful output before the lines above would be:\n\n     Rebasing branches:\n       --ours = \"main\"\n       --theirs = \"my_great_feature_branch\"\n\n   and vice-versa when doing a \"git merge main\" ie\n\n     Merging branches:\n       --ours = \"my_great_feature_branch\"\n       --theirs = \"main\"\n\n   this helps greatly in the otherwise confusing choice of command-line \noptions when trying to keep one of the versions intact:\n\n     git checkout (--ours|--theirs) -- x/y.z\n\n\n\n[System Info]\ngit version:\ngit version 2.43.0\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Linux 6.8.0-79-generic #79-Ubuntu SMP PREEMPT_DYNAMIC Tue Aug 12 \n14:42:46 UTC 2025 x86_64\ncompiler info: gnuc: 13.3\nlibc info: glibc: 2.39\n$SHELL (typically, interactive shell): /bin/bash\n\n\n[Enabled Hooks]\n\n\n-- \ndarko.\n\ndr darko veberic 大口 ~~~~~~~~~~~~~~~~~~~\nkarlsruhe institute of technology (kit)\ninstitute for astroparticle physics (iap)\ncampus nord 425, postfach 3640\n76021 karlsruhe, germany\nmobile: +49 151 5600 7386\noffice: +49 721 608 24704\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n"}]}