I did check in my stuff and merged my trunk with yours. But then I cannot merge the sling-de-tooling-1.0.10-SNAPSHOT tag with the trunk.
Is there a way to do this inside GIT or do I need to do that manually? Cheers - Andy > On Mar 14, 2016, at 12:22 AM, Robert Munteanu <[email protected]> wrote: > > Hi Andy, > > On Fri, 2016-03-11 at 11:49 -0800, Andreas Schaefer Sr. wrote: >> Hi >> >> I forked the Sling IDE Tooling to create the current version of the >> Eclipse Independent IDE Tooling based on version 1.0.10-SNAPSHOT. >> >> In order to do ask for a Pull Request I am wondering if I should do >> it for that version or merge my code with the latest (1.0.99- >> SNAPSHOT) beforehand. >> >> As of now my merge will add new classes but should not interfere with >> Eclipse at all. > > Sounds great! I suggest that you issue a pull request against the trunk > version, otherwise we'll need to forward-port it as well. > > Robert > >> >> Thanks - Andy Schaefer >
