There's a recent discussion thread about octopus merges on the main Git
List that may be of interest
https://lore.kernel.org/git/caoltt8s8rh+vycuaqbentmphirqw7hroplfpkxfntjq6bng...@mail.gmail.com/t/#u
On Friday, May 13, 2022 at 12:09:35 PM UTC+1 johannes.lipp...@gmail.com
wrote:
> (Of course
(Of course I forgot to attach the attachment)
On Friday, 13 May 2022 at 13:08:34 UTC+2 Johannes Lippmann wrote:
> Hello,
>
> I would like to merge multiple branches in one commit and resolve the
> merge conflicts by hand.
> I was suprised to learn that this doesn't seem to be possible with git
Hello,
I would like to merge multiple branches in one commit and resolve the merge
conflicts by hand.
I was suprised to learn that this doesn't seem to be possible with git and
am looking for a solution.
My (simplified) situation is like this:
I have a (python) project, versioned with git.
