Mad Man with a Compiler

Showing posts with label version control. Show all posts
Showing posts with label version control. Show all posts
Tuesday, July 30, 2019

Merge Conflicts for Non-Coders

›
I was discussing my day at work with my family, and I had spent much of the day resolving conflicts after doing a merge of two divergent bra...
3 comments:
›
Home
View web version

About Me

My photo
Preston Crow
I've been a professional software engineer for over 25 years, much of that time working at EMC in the Symmetrix microcode development team (now a part of Dell). I now work at WekaIO in the filesystem team. I have a Masters degree in Computer Science from Dartmouth College, where I almost completed a Ph.D.
View my complete profile
Powered by Blogger.