Justin Hileman

Also great for getting out of Git messes: http://justinhileman.info/article/git-pretty/

I've used the following flow chart to help determine strategies to get myself out of messes: http://justinhileman.info/article/git-pretty/ Just another way of presenting similar information. No affiliation, just a satisfied consumer of the info :)

This flowchart[1] has been useful to me a few times when I've been lost on how to fix something. I usually keep it as a bookmark, but I don't have it saved on this computer, so I just did a google image search and was able to fine it fairly quickly. A google image search for "git solution workflow" or "git fix flowchart" finds it right away, in case this tickles your brain in the future and you want to find it again, and vaguely remember it's easy to find through image search. Edit: Updated the link to go to the site referenced in the image. Might as well send you to who developed it so they get some credit. 1: http://justinhileman.info/article/git-pretty/

They A/B tested this as an experiment at least once. I recall there was another try too, but couldn't find info about it. http://justinhileman.info/article/googles-edit-search-results-experime…

this one is pretty funny: http://justinhileman.info/article/git-pretty/git-pretty.png

On a similar note is this flowchart which walks you through recovering from various Git mistakes: http://justinhileman.info/article/git-pretty/

I've tried the GitX integration to no avail http://justinhileman.info/git-for-coda/ I'm sure they're already working hard on Coda 2. I wonder if this might have been an experiment to see if Transit code could be ported to iOS

For example, with Mercurial, there's at least four different ways to do a rebase-ish thing: transplant, graft, rebase, and rebase (w/ evolve enabled). It's not obvious which a newbie should pick (rebase+evolve... I think?). You're cherrypicking--no pun intended. By default, Mercurial doesn't do any of these operations; you have to activate extensions. If I were a newbie coming from Git and I wanted a similar workflow using Mercurial, I would probably start with rebase. But these days, the Evolve extension is the way to go--using it is a lot easier than anything I've seen or experienced using Git: https://www.mercurial-scm.org/doc/evolution/user-guide.html. I find it kinda ironic when in this message thread, people are praising a chart like this--http://justinhileman.info/article/git-pretty/. It feels like the DVCS version of Helsinki Syndrome… By design, Mercurial makes it much harder to shoot yourself in the foot. In contrast, there's an entire cottage industry (https://ohshitgit.com and the like) to help when you--inevitably--get into a bad situation with Git.