[Xcb] git rollback question

Vincent Torri Vincent.Torri at iecn.u-nancy.fr
Thu Apr 27 12:04:38 PDT 2006

if you have not made a lots of modifications, you can rename the main xcb
dir (the one that contains xcb, xcb-utils, etc...) and make another clean
check out of the git tree.  It's usually quite fast.

maybe it's not the solution that you look for, but it should work (it
works for me, as i've already had those conflicts)

i'm also looking forward to the correct solution :)


On Thu, 27 Apr 2006, Ian Osgood wrote:

> I made similar changes as Jamey to fix deprecations, resulting in
> conflicts that I can't figure out how to resolve. Is there a way to
> rollback a local commit so I can sync back up with the main XCB
> repository?
> Ian
> _______________________________________________
> Xcb mailing list
> Xcb at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xcb

More information about the Xcb mailing list