gemmellr commented on PR #110: URL: https://github.com/apache/activemq-artemis-console/pull/110#issuecomment-3209718755
The reason this is saying it cant be rebased and merged due to conflicts seems to be due to the merge commit in the middle with the changes from #109, which were not linear with the other changes in the branch for this PR, and so the two streams of changes conflict with each other if trying to rebase the commits together. I think it would be nice to get rid of those seeming 'work in progress' commits without Jira refs to also get rid of the non-linearity, and so also fix the 'has conflicts' problem with this PR, by combining the changes from 109 into 1 commit and fixing up the other commits accordingly (or reworking the individual commits, including adding a Jira reference, if keeping them separate is actually desirable). -- 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. To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For additional commands, e-mail: gitbox-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
