Problematic Git Conflicts (1 cr)

Objective

After completing the course, the student will be able to:
• Use Git’s basic functions, such as branching and merging.
• Identify and resolve the most common Git conflicts.
• Understand how Git’s core structures (such as commit, branch, rebase, and merge) work.
• Apply Git tools to solve basic version control issues.
• Utilize best practices in Git workflows that help reduce conflicts.

Content

The course covers the use of the version control system Git, with a focus on situations where projects encounter conflicts between branches. The course emphasizes Git’s basic functionalities and equips students with the skills to understand and resolve common conflicts arising during merging and branching.

Evaluation scale

0-5

Assessment criteria, approved/failed

The student is able to successfully resolve key Git problem situations.

Objective

After completing the course, the student will be able to:
• Use Git’s basic functions, such as branching and merging.
• Identify and resolve the most common Git conflicts.
• Understand how Git’s core structures (such as commit, branch, rebase, and merge) work.
• Apply Git tools to solve basic version control issues.
• Utilize best practices in Git workflows that help reduce conflicts.

Content

The course covers the use of the version control system Git, with a focus on situations where projects encounter conflicts between branches. The course emphasizes Git’s basic functionalities and equips students with the skills to understand and resolve common conflicts arising during merging and branching.