Guido, > On 22 Oct 2015, at 00:35, Guido Lerch <[email protected]> wrote: > > At some point in time I would like someone to help me with GIT. > I find this confusing which is probably confusing to you. > > I work on a feature, figure out a bug, when trying to fix this I am > getting my branches confused, ending up in wiping it all away, > clone subsurface, building branches, reapplying patches etc. > > It can't be that difficult ... I read the FM and this didn't help. > > I have no GIT-brain ... and lost many hours of dev. time to this :-(
Wiping everything away and starting from scratch should be hardly ever necessary (I last did that when I updated my Qt version and that had deeply confused the compiler and make system. Everything else should be reversible. In particular you can unwind commits (with git reset which leaves the files what they are but undoes the commit statement or git revert which unapplies the changes) or move them to a different branch (git cherrypick or git rebase). I admit, these can be confusing (and they often are to me too) but in the end almost everything should be possible. Using a graphical front end to git (I use source tree https://www.sourcetreeapp.com) can be useful for getting an idea what is in which commit and how the different commits and branches relate to each other. If you describe your problem in more concrete terms maybe you can be helped. Best Robert
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
