search

apache / fluo-muchos

Apache Fluo Muchos
https://fluo.apache.org
Apache License 2.0
26 stars 37 forks source link

Fix broken link in CONTRIBUTING.md #376

Closed karthick-rn closed 4 years ago

ctubbsii commented 4 years ago

@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

karthick-rn commented 4 years ago

@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.