[TYPO3-dev] Problems with Mr. Jenkis
Philipp Gampe
typo3.lists at philippgampe.info
Tue Dec 20 10:18:40 CET 2011
Hi Stefan Geith,
Stefan Geith wrote:
> 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
> - git push origin HEAD:refs/for/master/32693
>
> Where did I fail ... ?
>
>
> > After the rebase (done by M. Klein ) Mr. Jenkins is happy again.
In git each patch has a parent commit. With your workflow that parent commit
does not change. However with a rebase, you change the order of commits by
putting your commit on top thus having a different parent commit.
Disclaimer: I am not a git expert (INGE).
Best regards
--
Philipp Gampe
More information about the TYPO3-dev
mailing list