[petsc-dev] 'master' RESET after bad merge! - 'tisaac/thplex' was based on 'next'

[Barry Smith]

On Sep 4, 2014, at 10:33 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
> The workflow is:
> 
> (1). verify what you are merging
> git checkout master
> git log ..branch
> git diff ..branch
> (2). merge the branch
> git merge
> (3). Build and make sure it builds
> ./configure && make all test
> (4). Now push to remote
> git push

   You forgot that since this process takes so long the push is rejected by the server due to other changes so you finally need to force it with 

git push -f 


> 
> So the issue comes up when:
> 
> (1) verify is not done and (2) merge messages are not read.
> 
> And the fix relies on doing (3) build & reading messages.
> 
> To me this is not really a fix [i.e fix for skipping a step to do
> another step. fix for not reading a message to to read another
> message]
> 
> Obviously everyone wants (1) and (3) to be automated - but we
> currently don't have that..
> 
> Satish