Hi Andrew at 24.06.2011 11:56, Andrew wrote: > 24.06.2011 09:17, Erich Titl пишет: >> Andrew >> >> at 23.06.2011 16:02, Andrew wrote: >>> 23.06.2011 16:18, Erich Titl пишет: >>>> Hi Andrew >>>> >> ... >> ...
>> > It seems like you already have added BuC repo, and now your local > master is synchronized with remote, and top commit in log should be > 907bb43. The BuC repo was probably created by the pull. I always expected a branch like BuC4 there. > Now you may try to switch to experimental branch and do git rebase to > current master. mega@luna:~/leaf/devel/leaf> git checkout experimental Switched to branch "experimental" mega@luna:~/leaf/devel/leaf> git rebase master Current branch experimental is up to date. As long as I stay in experimental everything appears to look as expected. The only thing that puzzles me now is how to see the differences between the branches. I understand that git diff shows the differences between commits, but what about branches? I don't want to merge blindly. Committing tarballs makes the conflict resolution more difficult IMHO. Do you think it is worth to keep work on 'leaf' untarred in the repository? cheers Erich >> I have the feeling the sequence of steps is enourmously important and >> navigating this maze is challenging. I guess GIT is good if you set it >> up once and then leve it that way. >> > No, sequence of steps is important only as required by logic. Git is > enough clean for learning, and has no voodoo tricks that can't be > understanded. >> Now What am I supposed to do to get all this right again. This thing >> really crapped out. >> >> cheers >> >> Erich >> > > > ------------------------------------------------------------------------------ > All the data continuously generated in your IT infrastructure contains a > definitive record of customers, application performance, security > threats, fraudulent activity and more. Splunk takes this data and makes > sense of it. Business sense. IT sense. Common sense.. > http://p.sf.net/sfu/splunk-d2d-c1 > > _______________________________________________ > leaf-devel mailing list > leaf-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/leaf-devel
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense.. http://p.sf.net/sfu/splunk-d2d-c1
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
