Piotr Krukowiecki <piotr.krukowiecki@xxxxxxxxx> writes: > git-status shows a hint that says > use "git add/rm <file>..." as appropriate to mark resolution > > But if I "git rm file" the file gets deleted. Is this really the > appropriate merge resolution? > > I would expect "git rm" to maybe reset all the merge changes but > it seems to just delete the file. Yes, if your side has a commit that updates a path since branches forked (e.g. fixing a minor bug in an implementation of a function defined there), and the other branch you are merging removed the path (e.g. fixing a higher level callers and made that buggy function no longer necessary), taking their removal can be a valid conflict resolution. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html