- 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.
JoshuaLam21/ex_merge
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|