It's the first full week of January this year. How many of your New Year's resolutions have you kept unbroken so far?
In connection with resolution, one of the many common things we (like to/have to) resolve is conflict. Conflicts often arise when two or more parties are involved in a given situation, and they also happen in software development. When the same line or portion of code is changed on two separate machines, the version control system detects a conflict. Some similarities between code conflicts and real-life conflicts are: (1) they are often — at first — perceived as scary, (2) they bring about fear of things closely associated with them, such as the fear of using Git or other version control systems. But fear not, because (3) there are many ways to resolve them. One highly effective way is sufficient communication among the involved parties — and this applies to both software development and its real-life analogy.
Further reading:
- coderefinery.github.io/git-intro/08-conflicts — for more information on the 2nd, 3rd, etc. highly-effective ways to resolve code conflicts
- centimentalcomics.com — shameless plug
This is 1 of the 12-ish posts in “Love Letters To Ruby”. a collection of contents about some Ruby programming concepts and how they shape modern life and or how modern life shapes them.
Top comments (0)