karthick-rn commented on pull request #376: URL: https://github.com/apache/fluo-muchos/pull/376#issuecomment-704600796
> @karthick-rn You introduced a merge conflict, probably because your local workspace was out of sync with upstream when you made the original change. It's not a big deal, and I have resolved the merge conflict. However, I am mentioning it only because I wanted to take the opportunity to suggest a project I made to help keep my local repos in sync with upstream, that you may also find useful: https://github.com/ctubbsii/git-sync Hi @ctubbsii Thanks for resolving the merge conflict. I was under the impression that my local workspace was up-to-date with upstream and only realised it's not after submitting the PR. That utility will be useful to me. Thanks for sharing. ---------------------------------------------------------------- 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]
