What are embedded systems, you ask? We have two offerings: a no-frills, honest description; and a tale of giraffes and sparrows that will hone your intuition.
This article was originally posted on my personal blog under the same title, “Dodging Merge Conflicts in git.” Introduction Of all the source control management systems that have ever been created, git is certainly one of them. You’ve probably used it, and been burned by a particularly complicated merge conflict. Resolving merge conflicts can be […]