Part II & III – Parallel Universes and Conflict Resolution (Laureesh Volmar) #215

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

Laureesh wants to merge 5 commits into RahafB:main from Laureesh:main

Laureesh commented Oct 24, 2025

Completed Part II and Part III of the Git 3rd Assignment.

Edited 02-add_nums.sh in master branch and parallel_universe branch
Created parallel branch and pushed unique edits
Merged both branches and resolved merge conflict
Added parallel.jpg and after-merging.jpg screenshots
Verified successful merge and pushed final commits

Laureesh added 5 commits

October 24, 2025 14:36


          Edited 02-add_nums.sh in master universe

1e784c0


          Edited 02-add_nums.sh in parallel_universe branch

2f0f86a


          Added screenshot of parallel branches

f212ada


          Resolved merge conflict between main and parallel_universe

009c75d


          Added screenshot showing merged branches

c56fa00

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

Labels

None yet