On Nov 3, 2014, at 10:41 AM, Jed Brown <j...@jedbrown.org> wrote: > "Dave Goodell (dgoodell)" <dgood...@cisco.com> writes: >> Most of the time a "pull" won't succeed if you have uncommitted >> modifications your tree, so I'm not sure how pull/commit/push would >> actually work for you. Do you stash/unstash in the middle there? > > Git will happily do the pull/merge despite your dirty tree as long as > none of the dirty files are affected. Linus says that he usually has > uncommitted changes in his tree when merging.
Hmm... you can see how often I create proper merge commits on a dirty tree. I must have been hit in the past by conflicting dirty files. -Dave
