Piotr Krukowiecki <piotr.krukowiecki@xxxxxxxxx> writes: > Hi, > > 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? In most cases, no, but when you have a modify/delete conflict for example, "git rm" is one of the candidates to resolve the conflict. The hint gives the general case. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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