[GIT GUI UPDATE] Local Merge Error: fatal:bad revision '^' . Anyone who can help ?

[pichyu]

Well , I've been trying to update my server with no succes.I Gui MaNGOS folder , Fetch from origin , and when I hit Local Merge i get this error :

fatal: bad revision '^'

fatal: bad revision '^'

while executing

"close $fr_fd"

(procedure "_new" line 114)

invoked from within

"_new $path 1 $title"

(procedure "::choose_rev::new_unmerged" line 2)

invoked from within

"::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]"

(procedure "merge::Dialog" line 30)

invoked from within

"merge::Dialog"

(menu invoke)

ANy help ?

[Phenomenon]

Well , I've been trying to update my server with no succes.I Gui MaNGOS folder , Fetch from origin , and when I hit Local Merge i get this error :

ANy help ?

"fatal: bad revision '^'

fatal: bad revision '^'"

This is the source of your error. Something's up with the revision number. I can't tell from what you've posted, but it's possible that you're trying to update/merge from an older version of MaNGOS (just throwing that out there, I'm no git expert).

[pichyu]

I have

(* * Revision 9933 - *)

. And i followed the Update guide on this website.

[xeross155]

Try merging it normally instead of using git gui

[pichyu]

Try merging it normally instead of using git gui

And how can i do that , can you explain to me ?

[xeross155]

And how can i do that , can you explain to me ?

git fetch origin

git merge origin/master