Rebasing tutorial seems a little wrong

[mercmobily]

Hi,

Thank you for writing this! I have been using git for a while now, and never actually understood what I was doing.

I have a question about intro4. I am pretty sure the last screen, when you run git rebase bugFix, has the wrong graphic representation on the right hand side in the tutorial.

After git rebase master, we have a sequence of changes, and it's all good. Then to move "master" down, you run git rebase bugFix while in master. However, what you see in the next step, where you are meant to run git rebase bugFix, is different: it has bigfix on the right side (still) and master is already at the bottom on the left (?).

I either haven't quite understood what's going on (possible), or the live chart on the right is not quite right!

Thanks again, I am finally grokking "git"... The live command line is especially important!

Merc,

[pcottle]

Ah you're right!! I totally messed this up -- looks like the command to set up the view beforehand had an issue.

This is due to the animation refactor -- since the git processes happen asynchronously now, I'll need some kind of way to force them to resolve and not wait for the animation.

I used to have all the git processes happen synchronously, so getting the repro in some kind of "state" was really easy. but now that rebase is promise-based, this is actually a bit issue...

This is super high pri, I'll try to fix this weekend. Thanks a ton for reporting Merc!

[mercmobily]

I am glad there was a problem -- so it wasn't me! :D This is the only guide that made me understand Git for real. I think it's one of the most invaluable things I've ever "read".

NOW I can finally read those books on Git, and become more advanced, without getting lost!

So, thanks again for creating it...

Merc.

[mercmobily]

Hi,

I don't mean to derail this, but I was also going to suggest, while you are there, that maybe you could add a couple of commits to bugFix before rebasing to master. This will append a few commits to master, rather than just one. I have just learned this stuff using your program, and can tell you that it would be a lot clearer to me if I saw a few patches underneath [master], representing what lead to [bugFix]. Just my 2c...!

Merc.

[pcottle]

@mercmobily I'm quite close on this -- I have a way to immediately get the tree structure for async git operations, so that's a big step forward. only issue is that there's visual breakage after, but I'm actively trying to fix this one :D

[mercmobily]

Hi,

Thanks for that. I just wanted to let you know that I did my first "real" merge not long ago, and if I hadn't done your tutorials, I would have been completely lost. Thank you!

Merc.

On 8 July 2013 09:06, Peter Cottle notifications@github.com wrote:

@mercmobily https://github.com/mercmobily I'm quite close on this -- I have a way to immediately get the tree structure for async git operations, so that's a big step forward. only issue is that there's visual breakage after, but I'm actively trying to fix this one :D

— Reply to this email directly or view it on GitHubhttps://github.com/pcottle/learnGitBranching/issues/111#issuecomment-20588809 .

[pcottle]

Woof, long break but I'm back on the horse. Intern season >___<

Ok so visual breakage is fixed, but there's something really weird with the way I'm processing certain async git commands. I send the right sequence of commands but in the shimmed version of git it doesn't seem to kickoff the rebase operation....

Anyways, this is basically just rambling but I'm looking into it. kinda embarrassing one of the rebase slides has been broken for so long

[pcottle]

Wahoooo finally!!! was a very complicated dispatch / promise chain thing....

ill push this out to prod right away

[pcottle]

Out in prod!

http://pcottle.github.io/learnGitBranching/?NODEMO&command=level%20intro4

[mercmobily]

Hi,

Thank you!!!

Merc.

On 22 July 2013 06:08, Peter Cottle notifications@github.com wrote:

Out in prod!

http://pcottle.github.io/learnGitBranching/?NODEMO&command=level%20intro4

— Reply to this email directly or view it on GitHubhttps://github.com/pcottle/learnGitBranching/issues/111#issuecomment-21323934 .