The Git cookbook

Git, you either love it for its power or hate it for it's ui. While I'm a trained git apologist and love its power and flexibility, I've also done a lot of git user support at work and in the #git IRC channel. I understand the frustration of the jumble of jargon, inconsistency and arcana that is the git UI and will help you dive into it!

If you have questions, comments or suggestions about any of the articles, please leave a comment on the article or in the issue tracker on GitLab. Suggestions for new articles are also very welcome!

Previewing a merge result

Posted on Mon 07 December 2015 in Effective git usage • Tagged with merge, diffLeave a comment

Can you preview what the result of a merge would look like? Sort of, here you can learn how.

Continue reading