> The condition to stop you is a bit stronger than that. > > By default, we would not even attempt to "merge into the branch" at > all. If your previous HEAD and the branch you are switching to are > different at a path you have local modifications in, then no changes > will be made and the checkout will fail. With "-m", we try to merge > and this merge can leave conflicts for you to sort out. Thanks, I wasn't sure based on the existing text what "modifications are kept" meant exactly, and I've always been slightly hazy about this behaviour. Will fix.
