polygene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Niclas Hedhman <nic...@hedhman.org>
Subject [HELP] Merge Error
Date Fri, 24 Apr 2015 06:56:31 GMT
Git Masters,

Two problems;

1) I made the mistake of merging 'Updating_deprecated_methods_in_ASM' to
'master', and pushed that before I realized the mistake.

Can anyone figure out what needs to be done to restore 'master'??

2) I missed to move the TAGS from the Qi4j repository to the Zest
repository. Can this be done now??

Sorry for the mess.

Cheers
-- 
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message