"git rebase --continue" fail and change Author

[Cyrillev91]

Hi,

I have been using SourceGit for some time and I am very satisfied with it, I would like to share with you an issue I found and suggestions for improvement during continue rebase (after conflit).

Issues found when rebasing a branch and there is a conflict to resolve. SourceGit changes the author of this commit (while with git on the command line the name remains that of the initial author)

I also think the commit button should be renamed to continue rebase for clarity. (since it should run git rebase --continue and not git commit)

Rebase with git command line

Initial state:

git clone https://github.com/thibault/iwantyoursocks.git
git switch master
git merge --no-ff origin/colors
git switch material

Start Rebase with git command line:

$ git rebase master
Auto-merging _layouts/default.html
CONFLICT (content): Merge conflict in _layouts/default.html
error: could not apply f99df10... Add link to material page in menu
hint: Resolve all conflics 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 f99df10... Add link to material page in menu

Edit _layouts/default.html file to resolve the conflict, then continue by

$ git add _layouts/default.html

$ git rebase --continue
(edit commit message and close editor)
[detached HEAD 0f8d266] Add link to material page in menu
 Author: Thibault Jouannic <thibault@miximum.fr>
 1 file changed, 1 insertion(+)
Successfully rebased and updated refs/heads/material.

show log with your favorite SW

===> Please note that the last commit (the one with the conflict) does not change author

Rebase with SourceGit

Initial state:

git clone https://github.com/thibault/iwantyoursocks.git
git switch master
git merge --no-ff origin/colors
git switch material

Start Rebase with SourceGit:

right click on master branch and select rebase material on master...
then clic on RESOLVE button

Edit _layouts/default.html file to resolve the conflict, then continue by

return to SourceGit software then select default.html and clic STAGE button
then clic on CONTINUE button (see note 1 below)

issue n°1 issue :

workaround ? (or normal button) : clic on COMMIT button: (see note 2 below)

then clic on CONTINUE button (see note 3 below)

go to Histories

issues n°2 : Please note that the last commit (the one with the conflict) : the author's name has been changed

notes 1, 2 and 3

I think the ergonomics of SourceGit would be improved if

• the CONTINUE button did not exist (note 1)
• the COMMIT button is renamed to CONTINUE REBASE (at note step 2) (or hide the commit button and show a CONTINUE REBASE button instead)
• pressing the CONTINUE button (at step 3) is not necessary

[love-linger]

Done. You can download the latest CI build from Github Action.

• Fix the exit code when try to start SourceGit as code editor (rebasing).
• Redesign the layout for in-progress states.

[Cyrillev91]

Hi love-linger,
I just checked by reproducing the steps above. It works perfectly well (tested on Windows).
Thanks