[vtk-developers] Git Merge commit declined

[Bill Lorensen]

So how do I modify my workflow. Here is what I did

git checkout TestHarness
  edited a bunch of files
  compiled and tested my changes
  added and committed
git checkout master
git merge TestHarness
git pull
git push


On Sun, Aug 22, 2010 at 3:09 PM, Marcus D. Hanwell
<marcus.hanwell at kitware.com> wrote:
> On Sun, Aug 22, 2010 at 3:05 PM, Bill Lorensen <bill.lorensen at gmail.com>
> wrote:
>>
>> I tried to push some changes to master. Here is what happened...
>> [lorensen at localhost VTK]$ git push
>> Counting objects: 32, done.
>> Delta compression using up to 2 threads.
>> Compressing objects: 100% (19/19), done.
>> Writing objects: 100% (19/19), 2.10 KiB, done.
>> Total 19 (delta 14), reused 0 (delta 0)
>> ----------------------------------------------------------------------
>> merge commit 06c3f787 not allowed
>> ----------------------------------------------------------------------
>> error: hook declined to update refs/heads/master
>> To git at vtk.org:VTK.git
>>  ! [remote rejected] master -> master (hook declined)
>> error: failed to push some refs to 'git at vtk.org:VTK.git'
>>
> When pushing directly to VTK, no merge commits are allowed. You probably did
> a git pull and created a merge with the remote master, you can tell by
> issuing,
> git log --graph --stat origin/master..
> In all likelihood, you can fix it by simply issuing,
> git pull --rebase origin/master
> We do have a topic stage that allows merge commits. If you get stuck, you
> can always push your topic and let me take a look at it for you.
> Thanks,
> Marcus