Open setriplette opened 7 years ago
@msb81 @ahunker If you have made changes to files that you want to push, store an extra copy on your desktop, pull, and then put the file in your local golden age folder. This should help us resolve the merge conflict.
@msb81 @ahunker If you have made changes to files that you want to push, store an extra copy on your desktop, pull, and then put the file in your local golden age folder. This should help us resolve the merge conflict.