djencks commented on pull request #3879: URL: https://github.com/apache/camel/pull/3879#issuecomment-639966932
The maven source check problem is unrelated to this work. When this work is merged I think it should have 3 commits: - the gulpfile changes - the manual changes to components .adocs adding the "group" attribute - the generated changes from the maven build and the gulpfile build. When I tried to investigate the "can't rebase" warning I see from GitHub, and tried git rebase master on your branch, there was certainly a merge conflict, but I couldn't understand it. I think if you start by running `git rebase -i c9d5377fd7a7888f9edeee649ead99084cccf64e` and reordering and squashing your commits into the above 3 it will be easier to see if there are any actual problems. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
