Skip to content

Latest commit

 

History

History
50 lines (39 loc) · 3.18 KB

README.md

File metadata and controls

50 lines (39 loc) · 3.18 KB

Emma Fu

ECE444-F2023-Assignment1

Activity 1:

Creating a public repository on GitHub 1 Adding name to README.md 2

Activity 2:

Creating and pushing branch develop 3 Creating new file and merging to main 4

Activity 3:

Creating PR with issue linked, contains merge conflict 5 Resolved merge conflict on GitHub 6 Screenshot 2023-09-10 at 8 24 42 PM PR merged successfully 8

Activity 4:

Adding two util function and their unit tests 9 10

Activity 5:

Creating C1, C2 on rebase branch a5 1 Creating C3, C4 on develop branch a5 2 Rebase commits from other branch a5 3 a5 4 Change order of commits to C3, C4, C1, C2 using rebase by using interactive editor a5 7 Originally lists C1, C2, C3, C4. Moved first two lines to the bottom to reorder a5 5 a5 7 Final commit order a5 8