Take the patch generated and apply it to the working copy (or apply it to the next revision in the chain toward making it a working copy).

Comments

bradfordcp’s picture

bradfordcp commented
Version: » 6.x-1.x-dev
Status: Active » Needs review

This has been complete since before mid-terms. When a conflict occurs the system detects this and attempts an automatic merging of the two sources. Should that occur without any issue, the merged result is stored and made active. If there is an issue the node appears in a conflict listing page allowing an administrator (or user with appropriate rights) to manual merge the page at their leisure.