Your branch and 'origin/master' have diverged.
Your branch and 'origin/master' have diverged. Two approach to resolve this are : git pull --rebase or Danger: You will scrap all your non-pushed data !!! git reset --hard origin/master
Monthly Archive: July 2014
Node.js error : SyntaxError: Unexpected token ILLEGAL [SOLVED]
Problem : 'Unhandled exception: [SyntaxError: Unexpected token ILLEGAL]' Solution : This can be many things, from a weird unicode character not appearing in your editor to a simple extra double-quote at the wrong place....
Backbone.Validation Checklist for troubleshooting validation not working
Client-side javascript validation using Backbone.Validation Troubleshooting Checklist (1) Make sure backbone.validation.js and backbone.validation.bootstrap.js are included. backbone.validation.js : https://github.com/thedersen/backbone.validation/blob/master/src/backbone-validation.js backbone.validation.boostrap.js : https://gist.github.com/driehle/2909552 (2) Make sure your model extends Backbone.Model() and add a validation object to your model after the default declaration : SuperApp.Model = Backbone.Model.extend({ defaults...
wrong ELF class: ELFCLASS64
error while loading shared libraries: libXv.so.1: wrong ELF class: ELFCLASS64 [root@kraken sbin]# ./krakend ./krakend: error while loading shared libraries: libXv.so.1: wrong ELF class: ELFCLASS64 Solution : Either install the 32-bit library missing -or- compile...
How to correctly url-encode text across php and javascript
Hello ! So you have came to me again to seek invaluable tech tips on head-cracking problems. You did well and I was expecting you... please read below the answer to your much-awaited question....
How to change the default screen of XCOM Enemy Unknown launched from Steam
Steam UFO Enemy Unknown change screen (i) Open Steam (ii) Click Big Picture (iii) Click gear icon in top right (settings) (iv) Click "display" (v) Change "Target monitor" (vi) Click done
R programming howto
R programming notes and how to do. Split data frame by month s <- split(airquality, airquality$Month) # will output a list of data.frame. One data.frame per month. Applying a mean function to data splitted...
Recent Comments