Jakub Narebski <jnareb@xxxxxxxxx> writes: > BTW with "git add" way you have to know that "git add"-ing a file > would clear 'is in merge conflict' flags (well, will hide >0 stages...). Sigh... Again, you seem to be affected by the same confusion that caused you to think "git resolved" may have some reason to exist. An unmerged index with higer stages means that the contents that need to be in the next commit is _unknown_ for the paths. If somebody says "I am telling you that this path has the contents I want to have in the commit I will create next" (which is what "staging" the contents in the "index" is), what plausible reason does git have to keep the higher stages for them? At that point, the contents the user wants to have for these paths are known. -- 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
