Hi, Nothing beats getting to understand git directly.
What you are suggesting should be a basic git task. To be sure, I would branch version2a from version 2, merge master into it, then diff between master and version2a for peace of mind. After that, merge master into version2 and discard 2a. Tim Sent from TypeMail On 3 Jul 2015 05:21, at 05:21, Apple Xtools List <[email protected]> wrote: >Also check out Tower. Really great app! > >Todd > > > >> On Jul 2, 2015, at 4:02 PM, Jens Alfke <[email protected]> wrote: >> >> >>> On Jul 2, 2015, at 11:11 AM, Jerry Krinock <[email protected] ><mailto:[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 >> >> >______________________________________________________________________ >> This email has been scanned by the Symantec Email Security.cloud >service. >> For more information please visit http://www.symanteccloud.com >> >______________________________________________________________________ >> _______________________________________________ >> 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/applextoolslist%40filmworkers.com >> >> This email sent to [email protected] > > >______________________________________________________________________ >This email has been scanned by the Symantec Email Security.cloud >service. >For more information please visit http://www.symanteccloud.com >______________________________________________________________________ > >------------------------------------------------------------------------ > > _______________________________________________ >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/timbeauhk%40gmail.com > >This email sent to [email protected]
_______________________________________________ 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]
