merge_testing

Learning about types of merging 1.) fast forward merging 2.) Three way merging

Name		Name	Last commit message	Last commit date
Latest commit History 11 Commits
README.md		README.md
example.py		example.py
feature-2.py		feature-2.py
feature.py		feature.py
hello.txt		hello.txt
hi.txt		hi.txt

Provide feedback