aniruddhavpatil commented on pull request #11: URL: https://github.com/apache/airavata-mft/pull/11#issuecomment-626012664
@DImuthuUpe We're unable to trace where the conflicts seem to be. Here are screenshots of what we see: <img width="988" alt="Screen Shot 2020-05-08 at 4 39 09 PM" src="https://user-images.githubusercontent.com/15905232/81447593-eee7d680-914a-11ea-83f8-b132b663f4d6.png"> <img width="666" alt="Screen Shot 2020-05-08 at 4 40 17 PM" src="https://user-images.githubusercontent.com/15905232/81447595-f14a3080-914a-11ea-84fd-b42f3d6cbb79.png"> May I see what GitHub recommends we do with the `command line instructions` link in the screenshot you provided previously? ---------------------------------------------------------------- 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]
