search

ashish2199 / Aidos

A beginner friendly project with aim of creating our own version of Bomberman.
GNU General Public License v3.0
41 stars 27 forks source link

Added back the capitalization for constants #26

Closed dostertag closed 6 years ago

dostertag commented 6 years ago

Hopefully i pulled the right way this time. I did it incorrectly the first time and couldn't re-sync my branch (or just couldn't figure out how to). Thanks for your patience!!

ItsStolas commented 6 years ago

I did a similar thing and it cost me a couple hours trying to sync them back up haha. http://www.ocpsoft.org/tutorials/git/reset-and-sync-local-respository-with-remote-branch/

This worked for me in the end :)

ItsStolas commented 6 years ago

The only thing I'd note is that one of your commits seems to have deleted an entire file, and then rewrite it. Are you using the terminal to use git, or something like SourceTree?

dostertag commented 6 years ago

terminal only, until pull. To pull, I go to my repo on github, then pull to here....

otherwise in terminal to merge with origin/master.

dostertag commented 6 years ago

Not sure why the player class seemed to be deleted then added... I only searched through the player class and replaced constants with their new case....

ItsStolas commented 6 years ago

Not sure, it's not big deal :) My SourceTree does it sometimes too. No idea why, haha.