+ [2015-01-19T21:23:40Z] t4nk413 hehe. ok
+ [2015-01-19T21:23:46Z] t4nk413 miss that maybe :P
+ [2015-01-19T21:31:51Z] t4nk413 kevinprince: what do they mean with Include in your `composer.json` file: ?
+ [2015-01-19T21:32:05Z] kevinprince t4nk413: sorry can't help with that not a laveral dev

message no. 73829

Posted by Dan39 in #github at 2015-01-19T18:02:46Z

i think im confused about master vs branches. i fork a repo with master and bunch of branches, make changes, add the remote upstream and merge from their master like guide says
+ [2015-01-20T00:02:11Z] nojeffrey jkitchen thanks!
+ [2015-01-20T00:22:11Z] jaydubya 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
+ [2015-01-20T00:23:06Z] jaydubya the 'fix' earlier was that the staging server is case-sensitive and local isn't and we had a file called library.js locally that mapped to Library.js on the staging server
+ [2015-01-20T00:24:24Z] bee27 hi