On Mon, 08 Feb 2010 16:57:12 -0500, Daniel Barkalow wrote: > On Mon, 8 Feb 2010, Mark Lodato wrote: > >> All, >> >> I put together a "Visual Git Reference" containing visualizations of >> the most common git commands, for people who prefer to see images over >> text. It is designed as a reference, not a tutorial, so readers need >> to have some amount of experience before the page will become useful. >> >> URL: http://marklodato.github.com/visual-git-guide/ Git repo: >> http://github.com/marklodato/visual-git-guide/ >> >> If you have any feedback or suggestions, please let me know! > > The "3-way merge" node should graphically distinguish the base from the > two sides, rather than having all three just go in. The "3-way merge" > operation is tricky to understand visually without some sort of "split > and rejoin, with specific points" thing. > > Also, it would probably be worth showing the use of the index in the > process of a 3-way merge: all three versions go into the blue box, and a > combination (with conflict markers) goes into the pink box; the user > cleans up the pink box, and replaces the 3-part blue box content with > the cleaned-up single result content; then the commit gives the diagram > you have for "git merge other". > I often have difficulty trying to internally visualize a mapping from the commits of a merge to the panes of a kdiff3 session. I have special difficulty keeping straight which commit is the LOCAL and which is the REMOTE. Looking at your visual guide, I can almost see a kdiff session in this section on three way merge where each commit sits in one of the panes. b325c in upper left, ed489 in upper middle, and 33104 in upper right, "Working Directory" on the bottom pane. Not sure if that graphic would be useful to anyone else. Thought I'd throw it in for grins. I learned a few things from your guide. I've been using git for about a year and a half. Thanks. John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html