Hi, On Sat, 03 Mar 2012, Helge Kreutzmann wrote: > If I should simply "git push" and "git pull" thats fine with me as > well, just last time this was not desired. If you use "git pull --rebase" instead of "git pull", it should be mostly fine. Cheers, -- Raphaël Hertzog ◈ Debian Developer Pre-order a copy of the Debian Administrator's Handbook and help liberate it: http://debian-handbook.info/liberation/