Le 04/10/2016 à 03:40, Andrew Taumoefolau a écrit :
Have further commits been made on top of the branch merge?
Yes. Commits on both branches.
On 4 Oct. 2016, at 1:22 am, Nicolas Pinault <[email protected]> wrote:
Hi,
I accidentally merged 2 branches. Before I realize it I committed changes and
pushed to the server.
When I try to backout the merge node, I get : "abandon : cannot backout a merge
changeset"
What is the best way to correct this error ?
Nicolas
_______________________________________________
Mercurial mailing list
[email protected]
https://www.mercurial-scm.org/mailman/listinfo/mercurial
.
--
*Nicolas PINAULT
R&D electronics engineer
*** [email protected] <mailto:[email protected]>
*AATON-Digital*
38000 Grenoble - France
Tel +33 4 7642 9550
http://www.aaton.com
http://www.transvideo.eu
French Technologies for Film and Digital Cinematography
Follow us on Twitter
@Aaton_Digital
@Transvideo_HD
Like us on Facebook
https://www.facebook.com/AatonDigital
_______________________________________________
Mercurial mailing list
[email protected]
https://www.mercurial-scm.org/mailman/listinfo/mercurial
