conflict resolution
It’s the first full week of Jan. this year, how many of your New Year’s resolutions have you kept unbroken… so far?
In connection with resolution, one of the many popular things that we (like/have to) resolve is conflict. Often arise when there are two or more parties involved in a given situation, conflicts, also happen in software development. When the same line or portion of a code has been changed on two separate machines, the version control system issues a conflict. Some code and real-life similarities of conflicts are: (1) they are often — at first — perceived as scary. (2) they bring about fear of the things closely associated to them, like for example, 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 enough communication among the involved parties — and it 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.
