Assume Beth and you can Abe for every single going another file , with the exact same information
The brand new document labeled right ‘s the document when you look at the Beths workspace. To start the brand new dispute solution processes, Beth earliest preserves the menu of issues:
Today Beth yourself merges (having fun with her favourite mix equipment) and you can _MTN/resolutions/checkout.sh-abe , leaving the results within the _MTN/resolutions/checkout.sh-mix (maybe not inside her copy).
Different documents
The following circumstances, where a few other data files accidently have the same title, are solved by the renaming you to or both.
Imagine Beth and you will Abe for every take effect to your some other thermoregulator habits (say Honeywell and you can Westinghouse), nonetheless they both title the brand new document thermostat . When Beth attempts to merge, she’ll have the same mistake content as in the initial case. When she retrieves Abes file, she’ll notice that they must be other documents. So she renames the girl file, merges, and you will condition (again having fun with Conflicts sales):
Listing
When several listing are offered a similar term, there are still the two basic approaches to solving the fresh conflict; miss https://hookupdaddy.net/ otherwise rename. not, when the a collection try fell, all of the data with it might also want to feel decrease. Ergo, most commonly it is better to first rename among the many lists so you can a temporary label while the dispute resolution, then handle the brand new data files actually, renaming or combining and shedding for each.