JRJurman/RapDevXI — Issue #4: Unwanted merge?
Author: thenickperson
Created: 2012-03-07 20:15:54+00:00
State: open

I was making a little tweak to B/game.lua and committed it. I tried to push, but there were conflicts, so I pulled. Weird thing is, git then had an extra commit (https://github.com/JRJurman/RapDevXI/commit/73b4abea5c9087d3f9f5196b60ebdd91c89353ec) for the merge. I pushed both of these, but I can't tell if this last commit is wanted.

I'm posting this as a warning in case I messed anything up. If my last commit is unwanted, feel free to get rid of it.