Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Jed Brown
Paul Hargrove writes: > IIRC it was not possible to merge with a dirty tree with git 1.7. Nope. This warning was added to git-1.7.0: https://github.com/git/git/commit/e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c Discussion thread:

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Paul Hargrove
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) wrote: > On Nov 3, 2014, at 10:41 AM, Jed Brown wrote: > > > "Dave

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Paul Hargrove
On Mon, Nov 3, 2014 at 8:29 AM, Dave Goodell (dgoodell) wrote: > > btw, is there a push option to abort if that would make github history > non linear ? > > No, not really. There are some options to "pull" to prevent you from > creating a merge commit, but the fix when you

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Dave Goodell (dgoodell)
On Nov 3, 2014, at 10:41 AM, Jed Brown wrote: > "Dave Goodell (dgoodell)" 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

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Jed Brown
"Dave Goodell (dgoodell)" 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

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-03 Thread Dave Goodell (dgoodell)
On Nov 1, 2014, at 3:44 AM, Gilles Gouaillardet wrote: > Hi Dave, > > I am sorry about that, the doc is not to be blamed here. > I usually do pull/commit/push in a row to avoid this kind of things but i > screwed up this time ... > I cannot remember if i did

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-01 Thread Jeff Squyres (jsquyres)
On Nov 1, 2014, at 4:44 AM, Gilles Gouaillardet wrote: > I am sorry about that, the doc is not to be blamed here. > I usually do pull/commit/push in a row to avoid this kind of things but i > screwed up this time ... > I cannot remember if i did commit/pull/push

Re: [OMPI devel] OMPI devel] [OMPI commits] Git: open-mpi/ompi branch master updated. dev-198-g68bec0a

2014-11-01 Thread Gilles Gouaillardet
Hi Dave, I am sorry about that, the doc is not to be blamed here. I usually do pull/commit/push in a row to avoid this kind of things but i screwed up this time ... I cannot remember if i did commit/pull/push or if i simply forgot to pull btw, is there a push option to abort if that would make