Git conflict “both deleted”
As stated in this answer (suggested as a duplicate) : you can see a “both deleted” when branchA has a git mv oldfile newstandard commit, and branchB has a git mv oldfile newcustom commit. In that case, when trying to merge customBranch into standardBranch, git will report a conflict on three files : both deleted: … Read more