Bill Priest wrote: > All, > I merged from one branch to another and had lots of > conflicts. I've resolved a set of files from the > conflicts (in a directory) and did a git-add on this > set of files. I wasn't able to commit these files. > On IRC I was told that all files must be resolved > before I can commit any of them. This seems pretty > limiting. Why is a commit after a merge all or > nothing; I thought that git figured out merges and > such by the differences between files?? You have to resolve _conflicts_ only. The rest is added automatically. See git-status, git diff --merge, git ls-files -u. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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
