search

barbagroup / JITcode-MechE

Online learning modules to learn computing in a problem-based context within Mechanical Engineering
MIT License
7 stars 5 forks source link

Pull requests #14

Closed agolding718 closed 10 years ago

agolding718 commented 10 years ago

It says the branches can't be automatically merged; I don't necessarily want to merge them right now, but I'd like to be able to accomplish it. How do we fix this? It looks like just the lesson one ipynb won't go.

ahmadia commented 10 years ago

https://help.github.com/articles/resolving-merge-conflicts

If you're stuck I can resolve the conflict...

gforsyth commented 10 years ago

I believe this has been settled. Reopen it if there are still questions about merging.