“The Guy with Conflicting Files”, that’s what they called me for two weeks in my first job as a software developer, all because I didn’t know about “Git.” Here’s what happened…
If you’re a web developer, you know that Git is a version control system for code, allowing you to manage all the changes made to an application’s code.
A conflicting file arises when two separate branches have made edits to the same line of a file, or when a file has been deleted in one branch but edited in another.
These conflicts usually happen when working in a team environment of programmers.
During my first week back then, they told me to install “TortoiseSVN” (a tool that facilitates interaction with Git repositories and other version control and file change management actions).
And they gave me this link to download the project, OK…
I was adding a PHP functionality like a champ, working on a file in the web project.