Common Ancestor When merging a file with conflicts: The version of the file that current and other branches originated from. Dirty working directory If files have been updated in the working directory after they were updated in the index then the working directory is considered "dirty". The working