Joined September 2012
·
Achievements
71 Karma
0 Total ProTip Views
Raven
Have at least one original repo where some form of shell script is the dominant language
Mongoose 3
Have at least three original repos where Ruby is the dominant language
Forked
Have a project valued enough to be forked by someone else
Walrus
The walrus is no stranger to variety. Use at least 4 different languages throughout all your repos
Charity
Fork and commit to someone's open source project in need
Mongoose
Have at least one original repo where Ruby is the dominant language
Ashcat
Make Ruby on Rails better for everyone by getting a commit accepted
You can also use Tim Pope's fugitive plugin. When you run :Gdiff on a conflicted file it automatically splits into 3 windows with the Target branch on the left, the file with conflict markers in the middle, and the Merge branch in the right window.