mfholdfield@mario:~/Documentos/Sigel$ git pull
remote: Counting objects: 38, done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 30 (delta 21), reused 0 (delta 0)
Unpacking objects: 100% (30/30), done.
From github.com:linze/Sigel
   d5faf48..ec3ebac  master     -> origin/master
Updating d5faf48..ec3ebac
error: Your local changes to 'src/Sigel.lpi' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.
mfholdfield@mario:~/Documentos/Sigel$ git pull git@github.com:linze/Sigel.git
You asked to pull from the remote 'git@github.com:linze/Sigel.git', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.