I’ve found that when I do a rebase on a branch more than once (e.g. I create a branch called marketing, make changes, rebase to master, make more changes, and then rebase again) that the branch will actually come into conflict with its own changes. In these cases, I’ll do a git rebase and run git rebase –skip for each conflict until the end of the rebase.

What this does is ignore all the conflicts that the branch has with itself, and applies all of the changes of that branch to the parent branch that don’t cause any commits.

(But hey — seriously speaking. My GPS is still cloaked in mystery. It has features that are far from self-evident. I wish it offered me a bit more help than it does. Garmin GPS. When I add a destination, I can’t figure out how to tell it which order I want to drive to the various destinations in. Wish they had good blue mango style documentation on their website that would tell me how to use its more advanced features.)

Fun video though! (And it DOES make a good point for most users :-)

I agree that pictures make things so much easier. I can’t tell you how many times customer service people have thanked me for sending them a screen shot tutorial of my problem.

Yes. We think you should add many, many screenshots to your help files. Help files with more pictures and less text makes happier customers.

Thanks,

To me, life is about questions, and getting them answered quickly and elegantly.

Your software helps people get answers, and I applaud your efforts to encourage businesses and individuals around the world adopt this approach.

Thanks a million.