Shupak, Vitaly writes: > "git pull --rebase" requires having NO uncommitted changes, even if > the locally modified files haven't been updated upstream, or even if > there are no changes to upstream at all. I know I could use It isn't just about whether upstream has changed those same files, but also would fail if any of your commits have. > --autostash, but that's inefficient and may be undesirable if it would > create a conflict. If that creates a conflict, then the pull would definitely fail if it had been attempted.