Fixing conflicts

Screenshot of gitk

The more programmers working in the same piece of code, the more conflicts will occur. So fixing conflicts is a common task when programming. Like many other organizations, here at Watu we use git as our version control system. Today I’d like to share a not-so-known tool very useful for properly solving conflicts:

It will show you the commits in …

Carousel Apps coder speaking at PyConAr

Ruby for Python programmers

PyConAr is the main Python Conference in Argentina which will happen from the November 13th to 15th in Rafaela, Santa Fe and our very own Juanjo Conti is going to be presenting. If you been following our development blog, you might be wondering how is this possible, since the main language at Carousel Apps is Ruby. All developers at Carousel Apps know …

Run bundler-audit during testing

There’s a gem called bundler-audit that checks whether any of the gems in your project have open security advisors against them. A year or so ago there was an infamous month in which Rails itself got three of those. It was terrible and I think bundler-audit is a good idea. My only problem with it is having to remember to …