search

ebeshero / DHClass-Hub

a repository to help introduce and orient students to the GitHub collaboration environment, and to support DH classes.
GNU Affero General Public License v3.0
27 stars 27 forks source link

GitBash Error #729

Closed ajw120 closed 4 years ago

ajw120 commented 4 years ago

Hi!

I've been trying to push changes to Undertale's project repo and there continuously is an error, not allowing me to do so. Would someone be able to help me fix this issue, whether it be in class today or some time soon?

ebeshero commented 4 years ago

@ajw120 Happy to help--is it a merge conflict? I'm in my office (FOB 204) right now if you want to come over. Or I can help right after class today.

ebeshero commented 4 years ago

@ajw120 I think you're sorted now, so I'm closing this--reopen if something goes wrong!