[SR-Dev] commit & push into master / public branches

[Henning Westerholt]

On Thursday 23 April 2009, Andrei Pelinescu-Onciul wrote:
> When updating your local branch (e.g. master) with the repository
> version, please always add --rebase to git pull
> (e.g. git pull --ff --rebase origin master).

Hi Andrei,

i've tried your suggestion before commiting:

henning at ca:~/sip-router$ git pull --ff --rebase origin master
config.h: needs update
[some other files and dirs..]
refusing to pull with rebase: your working tree is not up-to-date

Perhaps this only work when i've a complete clean tree?

Cheers,

Henning