Skip to content
Home
Menu
Mother of merges..
marco
in
Personal
,
programming
March 13, 2015
Image
Just another day, trying to update the branch when wild “merge failed” appears.
Post navigation
What if…
You know what would be great for the Mission Control?
Menu
Menu
Top Categories
programming
Share
Pictures
Flickr
Top posts
Documentando código en Python
Buenas prácticas en Python
Buenas practicas en Django
Win32 Services
Python trick: How to make lazy objects?
Get attachments with Python over IMAP
Python: Simple HTTP Server on python.
The best MacBook Pro is the one that is obsolete
My (zen) experience with Digital Ocean
La realidad del voto nulo – YouTube
Servicios recomendados
Digital Ocean
LastPass
Cursos
Programación basica en Python
Flickr
Old Blog
Amazon Wishlist