- Examine the chanages made to the various branches since alice and bob has branched from the 'main' branch.
- Merge the 'alice' and 'bob' branch to the main branch. Resolve the conflict, stage the change and commit the update.
- Push the main branch to origin.
forked from COMP3122-2425Sem2/ex_merge
-
Notifications
You must be signed in to change notification settings - Fork 0
James9143/ex_merge
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
No description, website, or topics provided.
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published
Languages
- Python 100.0%