3 ms·
"How git works", especially demystifying merge conflicts, has been a major pain point at all my jobs from embedded to frontend web dev, unfortunately.
by kody 4y ago
"How git works", especially demystifying merge conflicts, has been a major pain point at all my jobs from embedded to frontend web dev, unfortunately.
- bacon_waffle 4y agoI'm a bit torn about it to be honest. On one hand, it's sad/frustrating to work with colleagues who can't be bothered to figure git out. On the other, it is sometimes nice to have a less technically-difficult distraction (or at least one in a different problem space) from what I actually get paid to do. Maybe the right thing is to lean in to it, and become a git consultant! I'm a bit scared to see if that's a thing - would be a sad commentary on the state of the software industry.
- scruple 4y agoFWIW, I'm aware of a handful of people that work for a very large AAA game studio, nearby where I live, who are, in fact, git "experts" -- and, really, just extremely knowledgeable about version control systems, generally speaking, since they don't just use git -- for the company and they spend a large % of their time helping these teams deal with version control issues. As I understand it, they've written a lot of automation to deal with recurring problems like merge conflicts, perforce depot / workspace issues, etc. And they make good money for that expertise...