@@ -134,4 +134,4 @@ To mitigate these issues, is part of why it's highly recommended that as you wor
If an issue does arise, the team will need to do some manual work to make the two branches compatible, but this is simply par for the course in software engineering, so don't worry about it.
That being said, this is all only if an issue arises that Git can't handle on its own. As noted, issues will only really prop up if the same part of the same file is touched. Git's pretty good at automating certain kinds of merges. If you simply add new functions or variables to a file, or create branch new files, Git will be able to apply these changes during a merger without issue. Most of this is automated, and problems can be solved.
\ No newline at end of file
That being said, this is all only if an issue arises that Git can't handle on its own. As noted, issues will only really pop up if the same part of the same file is touched. Git's pretty good at automating certain kinds of merges. If you simply add new functions or variables to a file, or create brand new files, Git will be able to apply these changes during a merger without issue. Most of this is automated, and problems can be solved.
