andrewminer / crafting-guide

The ultimate step-by-step guide to make anything in Minecraft
http://crafting-guide.com
66 stars 192 forks source link

Create a branch for uploads when multiple files need to be uploaded #180

Open andrewminer opened 8 years ago

andrewminer commented 8 years ago

PROBLEM

When a user is making a complex wiki edit they might need up incorporate a number of text edits along with uploaded image files. If some of these commits fail, then the update might be committed to the production site in a partially finished state. Any user change should be committed either completely or not at all. This should include subsequent edits made within a reasonable amount of time.

SOLUTION

All edits should be made on a branch and kept there until 30 min have passed since the last commit. At that point, a new pull request should be created with all the changes and merged into master.