CST438 Software Engineering: Module III

 Module 3: Git for Source Code Management

Some good points worth mentioning in regards to the use of git:

• have a git workflow established for the team that is sequential for commits, pushes, pull and merge conflicts is ideal and could aid to mitigate confusion later down the road.
• git's version control management takes time to understand but ideally should be treated like we are traversing a graph.
• git commit: commit changes locally
• git branch: can check for branches or create a branch if a name is appended
• git checkout: checks out a branch to be appended at the end
• git push: pushes changes on current branch to the remote branch
• git pull: pulls any changes to remote branch non-existent and merges to current  branch
• git fetch: will get any changes in remote and update remote, will require merges still
• git merge: merges current branch with whatever branch is appended to the statement.
• git status: to check which files are staged prior to commit
• git add: will add whichever file or directory appended afterward to staging prior to commit

The main thing we have to account for are merge conflicts, this is when two branches are to be merged that have differences on the same line. This is where we as a team have to discern which changes we want and which we should git rid of, or a combination of the two. Worth noting that although merge conflicts do happen when evaluating we have to properly ensure that the code committed does work because that is something we will have to manually check ourselves.