miniblog.

Dealing with merge conflicts is an important skill that I've seen many experienced developers struggle with. My experience might be biased from helping teams migrate from svn to git, but I've seen problems with all VCS.

Now that the dust is settling on ? instead of try! in Rust, there's a neat tool to automatically migrate your code: