Re: git stash while pending merge should not be allowed

2013-06-14 Thread John Keeping
On Fri, Jun 07, 2013 at 11:47:07AM -0700, Junio C Hamano wrote: Scott McPeak smcp...@coverity.com writes: I suggest that this problem could easily have been avoided if git stash refused to run with a pending merge (present MERGE_HEAD file), since this is crucial repository state that it

Re: git stash while pending merge should not be allowed

2013-06-13 Thread Scott McPeak
On 06/07/13 11:47, Junio C Hamano wrote: Scott McPeak smcp...@coverity.com writes: I suggest that this problem could easily have been avoided if git stash refused to run with a pending merge (present MERGE_HEAD file), since this is crucial repository state that it does not save. This seems

git stash while pending merge should not be allowed

2013-06-07 Thread Scott McPeak
A colleague of mine who is well-intentioned and fairly knowledgeable about git recently caused havoc with our repository while merging changes on the main line branch into a feature branch. The reason is that, along the way, he tried to use git stash while the merge was pending. A few commands

Re: git stash while pending merge should not be allowed

2013-06-07 Thread Junio C Hamano
Scott McPeak smcp...@coverity.com writes: I suggest that this problem could easily have been avoided if git stash refused to run with a pending merge (present MERGE_HEAD file), since this is crucial repository state that it does not save. This seems similar to what git cherry-pick does.