help on git revert

hong zhang henryzhang62 at
Sun Jul 26 17:54:08 UTC 2009


I need help on my git revert. 
But "git revert f3144600536155297b26634f7e1c30a9abbdfb36" cannot be done. See following

> git revert f3144600536155297b26634f7e1c30a9abbdfb36
Auto-merged net/mac80211/cfg.c
CONFLICT (content): Merge conflict in net/mac80211/cfg.c
Auto-merged net/mac80211/ieee80211_i.h
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_i.h
Auto-merged net/mac80211/iface.c
Auto-merged net/mac80211/mlme.c
CONFLICT (content): Merge conflict in net/mac80211/mlme.c
Auto-merged net/mac80211/rx.c
Automatic revert failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.

I need help on how to make this reverse done right.



More information about the devel mailing list