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
Hey all,
I've been spending a lot of time lately using git send-email to send
patchsets to mailing lists, and I'm super tired of supplying my SMTP
password each time. However, I cannot seem to figure out how to configure a
git credential helper for SMTP. No matter what syntax I try in my
Look up the --orphan options for brining in an independent line of
development into your repository. You can then formally merge the two lines
of development (hence you will then have two root commits). It is also
possible to use `git replace` if they are to looking like they occurred in
I have two projects that are currently in separate local repositories.
Given their current evolution, it now makes more sense that they should be
seen as a single project in a common repository.
Is there a way to combine the two together while keeping the update history
of both?
Either within
> 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
