At work I use VCR to capture output to make cucumber test runs faster. One problem is that these cassettes expire and cause merge conflicts. I recently found a solution to clean those up with grep and git. Let’s look at the command below:
$ grep -lr '<<<<<<<' . | xargs git checkout --ours
Here we see using grep to search in files for ‘<<<<<<<‘ and then use git checkout –ours to use our version of the conflict. We could also use –theirs if we wanted to use their version of the commit.