Merging pending contributions?

What happens in a scenario where User A makes a contribution and User B makes a contribution as well as some typo fixes but both users have contributed different data that are both quality submissions that should be accepted? are you forced to only pick one and the other user has to re-apply their changes to the now current/good revision?

• Reply
• More

• History
• Edit
• Link to

Tekmosis‎14:34, 31 August 2011

They all build on top of each other. So you can accept them all by accepting the lasting one. You can also "accept" each if you want. You are not really accepting diffs but rather whole revisions technically. It just happens to be convenience to review diffs against a known good state.

• Reply
• Parent
• More

• History
• Edit
• Link to

Aaron‎00:52, 10 December 2011