Thanks for the info. Neither "--rebase-merges" nor "--preserve-merges" can
prevent the changes made by "git commit --amend" against merge commit from
being lost. The only solution to recover the lost code is to make use of
"git reflog".
在 2019年10月18日星期五 UTC+8下午5:36:08，Mikko Rantalainen写道：
>
On Fri, 18 Oct 2019 at 11:59, Benjamin wrote:
> This could be an issue of git. The exact steps to reproduce this issue are
> as below,
>
> $git merge master
> ...
>$git rebase -i e705c6a dev1 # e705c6a is the ancestor commit of
> branch dev1
>In the interactive rebase page, Keep
This could be an issue of git. The exact steps to reproduce this issue are
as below,
1. Assuming you are working on a branch "dev1", and have submitted a couple
of commits in the branch;
2. Assuming some changes have been merged into master by others, and you
merge the changes from master into
