You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2020/04/19 23:56:35 UTC

[GitHub] [fineract] singkara commented on issue #737: FINERACT-38

singkara commented on issue #737:
URL: https://github.com/apache/fineract/pull/737#issuecomment-616246851


   Hi, @maektwain I have created the new branch FINERACT-38_rebase for the new changes. However, while cherrypicking, I had merge conflicts in multiple files and since I am not the writer, I am not sure which ones to keep. Perhaps we could get on a call and finish this.
   The attached screenshot shows the conflicts just because of cherrypicking 1st commit.
   <img width="1374" alt="Screen Shot 2020-04-19 at 19 37 33" src="https://user-images.githubusercontent.com/44347219/79703108-a5a51500-8277-11ea-927f-f968c8fc9df3.png">
   Although I have an intuition of which changes shall go in, just to be cautious I would ask you to review the merge conflicts once.
   


----------------------------------------------------------------
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:
users@infra.apache.org