CST438 - Learning Journal 3
Author
Date Published

Describe what are the good points about using Git for source code management. What are possible problems that Git merge does not solve when merging code from different developers?
Personally, I feel like it's difficult to talk about git in this context without it coming off like it's the second coming of christ or something. With that in mind let's start off by saying that version control is one of the most important tools for collaborative software development and git is undeniably the best version of source control and has been for decades.
Version control tracks changes within files across time. This gives users the ability to "rollback" breaking changes. It gives the ability to see differences or "diffs" between changes within the same file which makes it easy to spot mistakes.
There are so many different ways you can use git to improve the collaborative process and on top of that, it is very fast and accessible via CLI making it an invaluable tool for AI agents as well.
However, the pain points which still not have been addressed is when two authors make changes to the same file at similar points in time. This results in a merge conflict which must be manually resolved. Another author must decide which changes must be kept and which must be discarded to resolve the conflict.
Comments
Join the conversation! Login to reply to comments