CST438 Learning Journal 3

 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?  

Git is a useful source code management tool because it helps developers keep track of changes made to a project over time. Each commit creates a record of changes, which makes it easier to understand how the code has developed and to return to an earlier version if a new change causes problems. Git also supports branching, allowing developers to work on new features, bug fixes, or experiments without immediately changing the main version of the project. This is especially helpful when several developers are working on the same project because each person can work independently and later merge their changes together. Git also makes collaboration easier through shared repositories, and the commit history can help with code reviews by showing exactly what was changed and why. Since Git is distributed, developers also have a complete copy of the repository and its history on their own computers.


However, Git merge cannot solve every problem that occurs when combining work from different developers. Git can often automatically merge changes when developers edit different parts of the code, but it may create a merge conflict when they change the same lines. Developers must then decide manually which changes should be kept. More importantly, even a merge that completes without a conflict can still produce incorrect software. For example, two developers may change different files or different lines in ways that are individually correct but incompatible when combined. Git does not understand the intended behavior or business logic of the program, so it cannot determine whether the merged code works correctly. Merging can also introduce duplicate functionality, inconsistent designs, broken interfaces, or unexpected interactions between components. For these reasons, developers still need good communication, code reviews, automated testing, and integration testing. Git is very effective at managing and combining versions of source code, but human judgment and testing are still necessary to make sure the combined software is correct and reliable.

Comments

Post a Comment

Popular posts from this blog

Computer Science BS Journal (CST334) : Week 3

  This week in CST334 our lectures covered: Address Spaces, C Memory API, Address Translation & Base-and-bounds, Segmentation, Free Space Management. We also started working on our first group project this week. In this learning journal I'll write and explanation/what I think to be the most important bits of each subject. 1. Address Spaces An address space is the range of memory addresses that a process can use. Each process has its own virtual address space, isolated from others, managed by the operating system. Key Takeaways: Provides process isolation . Helps with security and stability . Enables virtual memory and memory protection. 2. C Memory API The C memory API includes functions for dynamic memory allocation and deallocation: malloc() , calloc() , realloc() , and free() . Key Takeaways: malloc(size) allocates a block of memory. calloc(n, size) allocates and zero-initializes memory. realloc(ptr, new_size) resizes previously allocated memory. ...
Read more

Computer Science BS Journal (CST334) : Week 5

    This week in CST334 our lectures covered: Concurrency and Threads, Threads API, Locks, and Lock-based data structure. In this learning journal I'll write and explanation/what I think to be the most important bits of each subject. We also had our midterm this week and I didn't do as good as I wanted to, I definitely need to focus some more on my studies. Concurrency and Threads Concurrency is the ability of a system to handle multiple tasks at the same time. Threads are the smallest units of execution within a process. Concurrency allows threads to run independently, improving efficiency, especially on multi-core processors. Key Takeaways: Concurrency enables better CPU utilization. Threads share the same memory space within a process. Context switching allows threads to appear to run in parallel. Can lead to race conditions if not properly synchronized. Threads API Threads APIs provide the functions and mechanisms to create, manage, and synchronize threads....
Read more

Computer Science BS Journal (CST334) : Week 8

 This was the final week for CST334. I just finished my final exam a little while ago and I can't tell you how happy I was that the time we were given to finish the final was two hours rather than one. My midterm suffered because I could not finish my exam in time, I had to "YOLO" a few questions for partial credit and ended up misreading two questions and putting answers not even related to those questions haha.  CST334 has been an amazing class. My biggest takeaways from CST334 had to of been Address Spaces, Files and Directories, and File Systems(Access and Data). These were honestly some of the things that were easier for me to understand so I feel like I learned the most from these topics. I think the biggest challenge for me in this class was learning to convert hex to decimal and vice versa. I know that seems ridiculous but only at the very end of the class did I get the hang of it and realize how simple it was. Another challenge for me was trying to remember all o...
Read more