[sage-devel] Accidentally merged and pushed other tickets branch

[Friedrich Wiemer]

In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally merged
the ticket branch forom #25766 <https://trac.sagemath.org/ticket/25766>.
Can someone help and tell me how to undo this? :/

[Friedrich Wiemer]

If I see this correctly, the commit history should be like this:
1b724d6 - worked on Jeroens comments
e8cd46b - Merge branch 'develop' into
t/25742/change_c_variables_to_64bit_in_booleanfunction_cython_code

so the merge commit
2d7915a - Merge branch 'u/asante/sbox_boomerang_uniformity' of
git://trac.sagemath.org/sage into
t/25742/change_c_variables_to_64bit_in_booleanfunction_cython_code
needs to be undone.

Post by Friedrich Wiemer
In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally
merged the ticket branch forom #25766
<https://trac.sagemath.org/ticket/25766>.
Can someone help and tell me how to undo this? :/

[Dima Pasechnik]

An easy way is to create another branch and replace the branch on the
ticket with a correct one.

Post by Friedrich Wiemer
In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally
merged the ticket branch forom #25766
<https://trac.sagemath.org/ticket/25766>.
Can someone help and tell me how to undo this? :/
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an
Visit this group at https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

[Timo Kaufmann]

Another (more destructive) way is to use `git reset --hard <commit>` to
reset the current branch to a particular commit and then `git push --force`
it to trac. Another option is `git rebase --interactive`.

Post by Friedrich Wiemer
In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally
merged the ticket branch forom #25766
<https://trac.sagemath.org/ticket/25766>.
Can someone help and tell me how to undo this? :/

[Volker Braun]

I think the git reset way is conceptually the easiest, just combine it with
cherrypick if needed:

git reset --hard [last-good-sha1] # go back in history
git cherry-pick [sha1-of-commit-to-add] # apply commit that you want to
preserve
... repeat as needed ...
git push --force # overwrite whats on the remote

Post by Timo Kaufmann
Another (more destructive) way is to use `git reset --hard <commit>` to
reset the current branch to a particular commit and then `git push --force`
it to trac. Another option is `git rebase --interactive`.

Post by Friedrich Wiemer
In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally
merged the ticket branch forom #25766
<https://trac.sagemath.org/ticket/25766>.
Can someone help and tell me how to undo this? :/

[Friedrich Wiemer]

Thanks to all for the quick help!