svn-merge.py and git

[Artur de Souza]

Hi Hugo!

Quoting Hugo Pereira Da Costa <hugo at oxygen-icons.org>:
> How can I achieve the same now that official oxygen is in git (in  
> kde-workspace)
> ?

I don't know the best way of doing this between svn and git. If  
everything was in git I would say that the best shot would be to have  
it in a branch and keep rebasing your branch with master. If you make  
this branch public then you would keep merging the branch with master.

I know I didn't help much, but.. :P

Cheers,

Artur

-------------------------------------------