[TYPO3-core] Incubator troubles

[Björn Pedersen]

Am 29.11.2011 17:36, schrieb Jigal van Hemert:
> Hi,
> 
> On 29-11-2011 9:59, Björn Pedersen wrote:
>> Looking at the git log in your project (
>>  
>> https://review.typo3.org/gitweb?p=TYPO3v4/Incubator.git;a=shortlog;h=refs/heads/project-graphicslibrary
>> )
>> this seems to be the cause. There the latest commit is from august, and
>> the other probably are from the Incubator master branch.
> 
> The cause is nice, but I really need a solution. I don't even care if
> the latest commit is from August, that is good enough for me at this
> moment.
> Merging this incubator thingy with master is a challenge which can be
> done later.
> 
> This is now the third day that I can't store my changes in the remote
> repository. I don't feel like doing any more changes with the advice
> "start all over" I was given earlier. :-(
> 
> Sorry if I sound desperate or irritated, but this super-de-luxe ultimate
> change management tool is only giving me headaches...
> 

Did you try to repush after the rebase ( in your local version you
already did the merge from master as can be seen from the history).

Otherwise create a new working branch from project-graphicslibrary and
just cherry-pick your last commit. Then you should be able to push.

Björn