I altered some names of files as I started to split up my classes, but now I am getting an conflict error. How do I resolve this?
CONFLICT (rename/rename): Rename "Ruby_game.rb"->"game.rb" in branch "HEAD" rename "Ruby_game.rb"->"ruby_game.rb" in "bb755b75896b09a2113c4a6b2a5a60dcf7d3ea2a" Automatic merge failed; fix conflicts and then commit the result.
Update: I deleted the ruby_game.rb
file from the directory on my OS, then I resaved it from Sublime Text under Ruby_game.rb
into the directory, then did the git mv Ruby_game.rb ruby_game.rb
. Now it wont let me commit due to "unmerged files."
I have read the other linked post but I am at such an rudimentary level that any slight variance throws me off. Note this is my first post here and I am just getting a hang of formatting and protocol, so please if I am not following best practices just considerately nudge me in the correct way.