The Guy with Conflicting Files
<p><em>“The Guy with Conflicting Files”,</em> 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…</p>
<p>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.</p>
<p>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.</p>
<p>These conflicts usually happen when working in a team environment of programmers.</p>
<p>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).</p>
<p>And they gave me this link to download the project, OK…</p>
<p>I was adding a PHP functionality like a champ, working on a file in the web project.</p>
<p><a href="https://medium.com/@diegomottadev/the-guy-with-conflicting-files-a155efb53ab0">Visit Now</a></p>