> On Jul 2, 2015, at 11:11 AM, Jerry Krinock <[email protected]> wrote: > > I have also been advised to try Atlassian’s SourceTree. I have it open now. > It has quite a complicated interface and I would need to study it quite a bit > and ask some questions in their forum.
I second Jonathan’s recommendation. If SourceTree is complicated it’s because Git itself is complicated; it’s a lot easier than using the command-line! > The last time I tried SourceTree, I got unexpected results and had to use > Time Machine :( I’ve gotten lots of bad results using Xcode to commit or merge; in my projects (maybe because they use submodules) it has a habit of checking in files that you didn’t tell it to check in. After you’ve resolved conflicts (with any tool) you can build and test the project to make sure everything still works, before you commit. That can save you from unexpected results. And even after you commit, you can undo the merge by resetting to the previous revision. —Jens
_______________________________________________ Do not post admin requests to the list. They will be ignored. Xcode-users mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/xcode-users/archive%40mail-archive.com This email sent to [email protected]
