Merge revert

[Nicolas Pinault]

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 <nicolasp at aaton.com> 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
>> Mercurial at mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial
> .
>


-- 
*Nicolas PINAULT
R&D electronics engineer
*** nicolas at aaton.com <mailto:nicolas at aaton.com>

*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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20161004/a73ade85/attachment-0002.html>