[TYPO3-dev] Problems with Mr. Jenkis

Björn Pedersen pedersen at frm2.tum.de
Tue Dec 20 10:24:42 CET 2011


Am 20.12.2011 09:09, schrieb Stefan Geith:
> Am 19.12.2011 17:25, schrieb Björn Pedersen:
>> [...]
>> Your patch was based on an old revision that contained the offendingg
>> parts.
>>
>> The wiki mentions that a rebase before pushing is recommended practice.
> 
> I started this way:
> - git checkout master
> - git pull && git submodule update
> - git checkout -b issue_32693 origin/master
> - ... edit files ...
> - git commit -a

shortly before commit (especially if the checkout is some time in the past):
git fetch origin
git rebase -i origin/master
(possibly resolve conflicts, run git submodule update --init  if more
submodules were added upstream, ...)
> - git push origin HEAD:refs/for/master/32693
> 
> Where did I fail ... ?

You did not really fail, you probably got biten by the addition of
linkvalidator as submodule.

Björn




More information about the TYPO3-dev mailing list