On Wed, Dec 29, 2021 at 2:35 PM Andrey Butirsky <butirsky@xxxxxxxxx> wrote: > > This is exactly what I tried to avoid, since Git already seem has all > the needed under the hood to prevent such disaster.. It'd be neat if you could specify -X ours/theirs/both But I'm not sure I would describe the current situation as disastrous
