Andreas Krey <a.krey@xxxxxx> writes: > when I have an ignored file in my workspace, is git > then also assumed not to remove it in the course > of a merge? IIRC, untracked files are kept during merge and across checking out another branch. Files that are deliberately marked as ignored by listing them to .gitignore mechanism are considered expendable, and they will be removed as necessary. This is because we do not have the fourth-class, "we do not want to add them to the history as tracked contents, but we do not want to lose them", aka "precious"; we only have three, i.e. "paths in the index", "path that are untracked" and "path that are ignored". -- 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