[TYPO3-core] Incubator troubles

[Peter Niederlag]

Hello,

Am 28.11.2011 13:55, schrieb Jigal van Hemert:
> Hi Peter,
> 
> On 28-11-2011 12:58, Peter Niederlag wrote:
>> What does 'git log
>> origin/project-graphicslibrary..project-graphicslibrary' say?

[...]
looks fine, apparently no "merge type" commits.

>> What does 'git log
>> oject-graphicslibrary..origin/project-graphicslibrary' say?
> I assume this should start with "project" instead of "oject".
> 
> $ git log project-graphicslibrary..origin/project-graphicslibrary
> 
> commit f200a1b5b8daed8b5e6f62826337e1f19aec18e0
> Author: Jigal van Hemert <jigal at xs4all.nl>
> Date:   Sun Nov 27 12:29:49 2011 +0100
> 
>     [FEATURE] Initialize graphics handlers
> 
>     New interface for graphics analyzers
> 
> Maarten at JIGAL /d/TYPO3/TYPO3 Core GraphicsLib/Incubator
> (project-graphicslibrary
> )

That is a signe that you didn't pull succesful yet! It says upstream has
a commit that is not pesent local yet.

Please try again to rebase your (pending) local changes onto this
updated tree before you submit(push).

git fetch --all
# drop --all, if git is not recent enough
git checkout project-graphicslibrary
git rebase origin/project-graphicslibrary
# rebase all local changes onto this tree

[...]

Greets and hth,
Peter
-- 
Peter Niederlag
http://www.niekom.de * TYPO3 & EDV Dienstleistungen *