[Olsr-dev] Possible to fix errors in git repo?

Henning Rogge (spam-protected)
Wed Jun 15 13:12:27 CEST 2011

On Wed June 15 2011 11:13:50 Ferry Huberts wrote:
> in vim you type:
> d500<enter>

Okay, I think I found a way without an interactive merge...

After we replaced the main repository,  each developer would have to do for 
each branch he use:
(example for stable branch)

> git fetch
(load the new commits but do NOT merge)

> git rebase origin/stable
(switch over to new commits)

After this pull/push does not copy the bad commits to the main repository 

Diplom-Informatiker Henning Rogge , Fraunhofer-Institut für
Kommunikation, Informationsverarbeitung und Ergonomie FKIE
Kommunikationssysteme (KOM)
Neuenahrer Straße 20, 53343 Wachtberg, Germany
Telefon +49 228 9435-961,   Fax +49 228 9435 685
mailto:(spam-protected) http://www.fkie.fraunhofer.de
GPG: E1C6 0914 490B 3909 D944 F80D 4487 C67C 55EC CFE0

More information about the Olsr-dev mailing list