Working Offline

The merge process for working offline has been simplified. Instead of using separate baselines for push and pull actions, there is now a single baseline. You resolve all merge conflicts during a pull, so they do not appear again in a subsequent push or pull. These changes make the merge status clearer when working offline.