Re: needs merge
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:16
Len Brown [off-list ref] writes:
$ git commit my-file needs merge how do i tell git that there is no merge to do and the (unchanged) working file is what i want to keep as the result of the merge?
Do you mean running
$ git update-index my-file
to mark the path resolved?