Name	Name	Last commit message	Last commit date
Latest commit cpuwzd2 This is expected to creat a conflict. Mar 3, 2021 f894d52 · Mar 3, 2021 History 15 Commits
FileWithConflict.txt	FileWithConflict.txt	This is expected to creat a conflict.	Mar 3, 2021
FileWithoutConflict.txt	FileWithoutConflict.txt	This is expected to creat a conflict.	Mar 3, 2021
Note.txt	Note.txt	Merge branch 'main' into main	Mar 1, 2021
Note2.txt	Note2.txt	This should be auto-mergeable.	Mar 1, 2021
README.md	README.md	Initial commit	Feb 28, 2021