andreas@andreas-laptop:~/repos/tms/tms$ git add .
andreas@andreas-laptop:~/repos/tms/tms$ git commit -m "New structure, better mobile layout"
[master 955c914] New structure, better mobile layout
 1 file changed, 224 insertions(+), 216 deletions(-)
 rewrite templates/base.html (62%)
andreas@andreas-laptop:~/repos/tms/tms$ git pull
remote: Counting objects: 30, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 21 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (21/21), done.
From bitbucket.org:andreasolsson/tms
   2c8bea5..c4bb6aa  master     -> origin/master
Auto-merging templates/base.html
CONFLICT (content): Merge conflict in templates/base.html
Automatic merge failed; fix conflicts and then commit the result.
andreas@andreas-laptop:~/repos/tms/tms$