New Advanced Tips

  1. Merging MQ Patches with Rebase

    MQ patches don’t usually merge well, but you can use the rebase extension to fix that!

  2. Styling Mercurial’s CLI

    Mercurial’s command line interface is great, but with a little bit of work we can make it even better!

  3. Handling Binary Files in a Merge

    Mostly we deal with text, source code etc. But sometimes we put binary files into our repository and dealing with the inevitable merge conflict is not as easy as source code.

  4. Combining Repositories

    What can you do when you realize: “Oh, maybe the documentation should be in the same repository as the code?”

  5. More…

New Beginner Tips

  1. Finding Uncommon Changesets

    How can you tell which changesets are included in revision X but not in Y?

  2. Reverting Dirty Files

    You’ve made some changes you don’t want to commit, here’s how to clear them out.

  3. Show Changesets Not Yet Pushed

    Show what changesets you’ve created since last time you pushed.

  4. Always Use Git Diffs

    Do you really need diffs that are compatible with a program released in 1985?

  5. More…