I amended the commit and then re-merged and the amended commit did not merge
On Thursday, 2 September 2021 at 19:02:01 UTC+10 philip...@iee.email wrote:
> > Do amends not merge?
>
> In general, don't try to `--amend` a merge. It would produce an evil merge
> (i.e. something in a notionally
> Do amends not merge?
In general, don't try to `--amend` a merge. It would produce an evil merge
(i.e. something in a notionally clean merge that wasn't actually present in
either branch). As best I remember, if you try to amend a merge you only
get an updated single parent commit, rather
