Earlier quoted context omitted.
Should work on Firefox, Chrome, and Safari. Anything specific you are noticing in another browser?? I rely pretty heavily on the box model for layout, but if you look at the CSS I included almost every browser extension (even Opera)
For example the buttons does not work in the levels dialog. I would make a pull request if I could figure out how to build it with Grunt...
Learn Git Branching
61–70 of 144 posts
Re: Learn Git Branching
#62That said, the intro lesson introduces commits as exclusively deltas. This isn't accurate, and would probably cause confusion with later concepts.
Commits are really snapshots of a tree object (with probably a whole lot of sub trees, and a whole lot of blobs). Since part of the commit meta-data is the parent sha, it's really easy for git to show you the delta, but at it's core git cares about linked snapshots of trees.
I am now done being anal retentive :-) thanks again for the great site, excited to see it more fleshed out
Re: Learn Git Branching
#63Earlier quoted context omitted.
Same! Sometimes I would like to introduce my coworkers to the amazing world of git, but it's hard to convince them without showing them a concrete example, this one is a pretty nice overview, and also useful for advanced users! I just got a better, more intuitive understanding of what detached HEAD really means thanks to it!
Git is amazing, I just wish if there was a better conflict resolving approach in Git.
Re: Learn Git Branching
#64shameless plug: www.srctree.net - Ace editor + git + canvas for viewing commits/branches. I built it about a year ago, mostly for learning and fun. I haven't advertised it a lot but it seems relevant in here. I hope it's not off topic!
Re: Learn Git Branching
#65Re: Learn Git Branching
#66Wow! Author here, did not expect this to get submitted to HN yet (was going to finish out a few more levels this weekend and clean everything up). Forgive the giant "TODO" in the help dialog The link everyone should see is the demo: http://pcottle.github.com/learnGitBranching/?demo That shows a few example commands, the completion of a level, and finishes with the help dialog. Some interesting technical highlights -…
Re: Learn Git Branching
#67I have trouble understanding the rebase workflow: What is the difference between these two sequences?
git checkout -b bugFix
git commit -m "fix"
git checkout master
git commit -m "master stuff"
git rebase bugFix
git checkout bugFix
git rebase master
and git checkout -b bugFix
git commit -m "fix"
git checkout master
git commit -m "master stuff"
git checkout bugFix
git rebase master
git checkout master
git rebase bugFix
Is it just the order of the commits in the final tree that will be different? Or I am missing something else?Instinctively I would tend to do the first one, but that was not what lesson 4 expected...
Re: Learn Git Branching
#68Absolutely fantastic tutorial, but as most other people here have mentioned there should probably be some indication that you should type help to get started.
I just pushed the site live, so it starts off with a help dialog and links to the demo. Future visitors should hopefully get a better experience! My apologies again -- I only noticed it was on HN when I got an email about it...
Seriously, very very well done.
Re: Learn Git Branching
#69Re: Learn Git Branching
#70C1' has two meanings, one is the result of a rebase, and one is the result of a revert. I stared at level 2 of "master the rebase, Luke" for a while before I realised this. I think these two things should be have different notations (maybe C1' and C1^-1, or C1' and C1r).