mhagger / git-imerge

Incremental merge for git
GNU General Public License v2.0
2.68k stars 126 forks source link

possibility of merging unrelated histories #203

Open Avinash-Bhat opened 1 year ago

Avinash-Bhat commented 1 year ago

like git, imerge also doesn't allow merging unrelated histories, but with with it can be forced by using --allow-unrelated-histories option.

is it possible to add a similar functionality to imerge?

background: I just ran into a situation which had unrelated histories because the team working on the project didn't understand git remote add command (smh). and I am left with two unrelated histories which has a ton of conflicts.