Closed LucasSilvaFerreira closed 8 years ago
It still says "This branch has conflicts that must be resolved". You can first do a 'git fetch' to download the latest updates, and then try 'git merge' and fix conflicts (it will tell you which file has problem, and mark relevant lines in the file), and then submit a pull request.
I think this works now... This files are metafiles from pycharm...i just checkout them
Thanks!
Sorry professor, I'm not familiar with pull request pattern. Thanks