koen.aers at gmail.com
Tue Apr 9 10:15:27 EDT 2013
> What kind of change caused that ? I only see the commit I pushed based on Denis Golovin patch on jbosstools-forge: https://github.com/jbosstools/jbosstools-forge/commit/a47e8b7fb2c2739c66f917eb8f3fa1f0ae939e70
> Could I have done something differently and we could have avoided that merge ? (I needed the fix in since otherwise jbosstools-forge was not building)
It is indeed because of Denis Golovin's patch and not Nick Boldt. Lincoln had removed all the .classpath and .project files in one of the commits on the master branch in the fork that is in the forge organization and those two changes were in conflict.
And no, I don't think you could have done anything else. Usually I merge the changes in the forge fork immediately in the jbosstools organization but this time there was a rather big change implying an upload of a lot of jar files in the repo which I was uncomfortable with. George fixed this by creating a Maven plugin that is able to pull in the jars at build time instead.
More information about the forge-dev