IOhacker commented on PR #5342: URL: https://github.com/apache/fineract/pull/5342#issuecomment-3833761189
@Kengne-yvana you have to resolve the conflicts doing a rebase in your local repository. Make sure to squash and commit for sending only 1 commit. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
