message no. 73870
Posted by jaydubya in #github at 2015-01-20T00:22:11Z
I get 'error: Your local changes to 'public/angular/controllers/editPlannedCrops.js' would be overwritten by merge. Aborting.' when doing a Git Pull on the staging server. There are NO changes made to the staging server usually but I had to 'fix' a capitalization issue earlier today. I don't want to lose that change