Skip to content

Assn 5b – Git branching, merging, and conflict resolution#280

Open
3yobk wants to merge 5 commits intoGGC-SD:masterfrom
3yobk:master
Open

Assn 5b – Git branching, merging, and conflict resolution#280
3yobk wants to merge 5 commits intoGGC-SD:masterfrom
3yobk:master

Conversation

@3yobk
Copy link

@3yobk 3yobk commented Feb 1, 2026

Completed Assignment 5b.

  • Checked out a previous commit and created a parallel branch
  • Made conflicting changes to the same bash script in two branches
  • Resolved the merge conflict manually
  • Merged the parallel branch back into master
  • Added a network graph screenshot showing the merge (after-merge.png)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant