This page moved to /cli/dotfiles/conflicts.html.