We are using cookies This website uses cookies in order to offer you the most relevant information. By browsing this website, you accept these cookies.
Fundamental operation that reconciles the changes made to two independent branches of a file into a single set of files that contains both sets of changes.