Ramkumar Ramachandra wrote: > Matthieu Moy wrote: >> No, you don't. Just try if you're not convinced: > > Oh, I trusted the documentation on this one and never tried with a > dirty worktree myself. Please fix the documentation, if you know how > exactly to correct it.
The manual says: "git pull" and "git merge" will stop without doing anything when local uncommitted changes overlap with files that git pull/git merge may need to update. That accurately describes the behavior. I wouldn't be surprised if there's still a documentation bug, though: a lack of clarity, a missing hint somewhere else, something else misleading. That seems especially likely when you say "I trusted the documentation on this one". Care to point to the appropriate section, so it can be fixed? Thanks, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html