MartaMerge conflict 
fabiosantoscode@FromTheFourthPlanet I was planning to spend the day rebasing multiple times so I tried this thing today. It really works. And when it doesn't, it merges what it can.
@fabiosantoscode
no problem, I think I fixed it, but I guess there is something missing in the repo... tomorrow I'll see...
no problem, I think I fixed it, but I guess there is something missing in the repo... tomorrow I'll see...
@FromTheFourthPlanet conflicts are so frustrating :/ I find it hard to keep 3 realities in my brain as I reason through code.
@FromTheFourthPlanet I don't mind the command line too much except for git's eccentricities haha
Like how it annotates your files with unsolvable conflicts using those <<<<< annotations, but which one is on top and bottom is really unintuitive.
@fabiosantoscode
this is *so* true
this is *so* true