Flowchart to solve common problems when something was done wrong in git.

Perform the merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.

git-imerge has two primary design goals:
- Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch.
- Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress.

Si vous ne voulez pas stocker vos dépôts de code sur Github et que n’avez besoin des fonctionnalités, de la complexité de Gitlab, que Gitweb et viewgit ne vous plaisent pas, alors vous trouverez peut être votre bonheur avec Gitlist.

One of the items in my dotfiles repository is my PGP keys, both private and public. I believe this is a unique approach that hasn’t been done before – a public experiment. It may seem dangerous, but I’ve given it careful thought and I’m only using the tools already available from GnuPG. It ensures my keys are well backed-up (via the Torvalds method) and available wherever I should need them.

Ry’s Git Tutorial is a complete introduction to distributed version control with a focus on practical command line usage. We explain Git’s robust branching, merging, and collaboration capabilities from the ground up, so prior experience with centralized systems like SVN or CVS is not required.