Monotone items data files, listings, and you may file services explicitly, and it also tunes personal document and you will index label away from birth to passing so title transform regarding full lives-duration is tracked just.
File Content Conflict
This type of conflict could be the one found most frequently and you can signifies conflicting alter made to lines away from text in this two models of just one file.
Whenever an incorporate demand experiences changes in a file both in thoughts prior to the common ancestor, it very first monitors to find out if this new file has an excellent mtn:manual_mix attribute which have worth true . Or even, it spends an inside merge algorithm to help you position perhaps the changes should be the same traces of your file. When they maybe not, monotone use the result of the internal merge while the the new document type. Keep in mind that that it elizabeth range is extra on two different locations about document, it could be in the results twice.
mtn:manual_combine try instantly put true when a file was put ed in which this new digital_document hook output correct; come across attr_init_properties. The user may also put new mtn:manual_merge characteristic yourself; see mtn attr .
In the event the mtn:manual_blend can be found and correct , or if the alterations are to a comparable traces of document, and you may none –resolve-problems nor –non-entertaining are specified, the newest merge3 connect is called, on the stuff of each other contradictory designs as well as their prominent ancestor. When the hook up yields, new combine continues to a higher dispute.
Alternatively, you need your chosen blend product asychronously for the combine, and you will indicate the effect file throughout the issues file, utilizing the Issues command:
Finally, instead of playing with a merge equipment you are able to to visit changes to 1 or both of the conflicting file products so that they can merge cleanly. This may also be an incredibly helpful means if for example the combine disputes are due to chapters of text message about file are went from a single spot to other. Unlike not able to mix particularly contradictory transform with a merge tool, similar rearrangements can be made to 1 of your own contradictory records prior to redoing the brand new blend.
Copy Title Argument
A copy name disagreement is when one or two distinctive line of data or listings have been because of the exact same name on two blend mothers. This may can be found whenever all the blend parents adds an effective the file or index toward contradictory label, or whenever you to parent adds an alternative document otherwise index with the newest conflicting name as well as the almost every other renames a preexisting document otherwise index toward contradictory term, otherwise when both parents rename a preexisting file otherwise list to the new conflicting label.
When you look at the earlier incarnations from monotone (prior to version 0.39) these types of argument try called a great rename address dispute though it doesnt necessarily have anything to do with renames.
- Two people one another discover a new document will likely be additional, and commit it. In this situation, this new records feel the right identity while the correct articles, but monotonous accounts a conflict while they have been extra by themselves.
- A couple each propose to add new records with different content, and you will mistakenly select exact same title.
Discover equivalent disputes to have listing; the procedure for resolving him or her is different, due to the fact we need to value the fresh new files about listings.
To the very first situation, brand new dispute try solved by losing you to document. Brand new information are manually matched, however if he could be a little some other. Generally speaking, a person can get one of many files inside their current workspace; others are going to be recovered through automate rating_file_out of ; this new revision id is found regarding combine error content.