search

Automattic / mirror

A plugin for keeping WordPress environments mirrored
10 stars 2 forks source link

Consolidate meta box buttons #5

Open danielbachhuber opened 11 years ago

danielbachhuber commented 11 years ago

Rather than having "Deploy", "Clone" and "Merge", we should just have "Push" and "Pull" with a small text explanation under each to point out what each does. If, when doing either action, you run into a merge conflict, our merge conflict resolution screen should appear.

joshbetz commented 11 years ago

Right now it runs the clone method at the end of the deploy method so it will delete everything and then pull down the version that it just pushed. This is obviously not optimal, but the diff3 algorithm uses the first revision as the "original". A better way would be to keep track of the revision number every time you pull and use that as the "original".