Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
3yobk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

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

3yobk wants to merge 5 commits into from
+30 −13

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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@3yobk