IIRC it was not possible to merge with a dirty tree with git 1.7. So, Dave, you may have been bitten in those dark days. -Paul
On Mon, Nov 3, 2014 at 8:49 AM, Dave Goodell (dgoodell) <dgood...@cisco.com> wrote: > 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 > > _______________________________________________ > devel mailing list > de...@open-mpi.org > Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel > Link to this post: > http://www.open-mpi.org/community/lists/devel/2014/11/16149.php > -- Paul H. Hargrove phhargr...@lbl.gov Future Technologies Group Computer and Data Sciences Department Tel: +1-510-495-2352 Lawrence Berkeley National Laboratory Fax: +1-510-486-6900
