[Xcb] git rollback question

[Josh Triplett]

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?

I find that rather than allowing automatic merges, I can just git-fetch
the new bits, "git-checkout -b newmaster origin" to make a new master
branch and switch to it, "git-cherry-pick -r a_commit_sha1" to
cherry-pick commits from the old master onto the new one (use "gitk
--all" to find the sha1sums you want), and then use "git-checkout master
&& git-reset --hard newmaster && git branch -d newmaster" to point
master to newmaster.  Then just push your changes and continue
development.  I've done this when I make the same commits locally that
appear on the server, but I've done other commits since then and don't
want to reset them away.

git-rebase may work here as well.

- Josh Triplett


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.freedesktop.org/archives/xcb/attachments/20060427/f940f6a7/signature.pgp