vorburger commented on issue #737: FINERACT-38 URL: https://github.com/apache/fineract/pull/737#issuecomment-613895824 > Hello @vorburger I did a quick rebase from develop branch to FINERACT-38 , let me know if this solves the conflict. @maektwain nope it does not... note the "This branch cannot be rebased due to conflicts" message, shown by GitHub just above? Also notice the build failure.. following #750 (based on #740) you have to remove that generics in your new class. You'll probably want the build to fully to pass locally first after a rebase before you push, and double check yourself that GitHub does not show you "This branch cannot be rebased due to conflicts" anymore.
---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
