GitHub

Name: Juan Antonio Martinez FSUID: jam14j

I merged without using the --no-ff flag. Please refer to the reflog.txt file. It will serve as proof of my branched developement.

Name		Name	Last commit message	Last commit date
Latest commit History 12 Commits
docs		docs
.gitignore		.gitignore
CommonSpear.cpp		CommonSpear.cpp
CommonSpear.h		CommonSpear.h
CommonSword.cpp		CommonSword.cpp
CommonSword.h		CommonSword.h
CrazyRandomSword.cpp		CrazyRandomSword.cpp
CrazyRandomSword.hpp		CrazyRandomSword.hpp
KriticalKatana.cpp		KriticalKatana.cpp
KriticalKatana.hpp		KriticalKatana.hpp
README.md		README.md
SimpleHammer.cpp		SimpleHammer.cpp
SimpleHammer.hpp		SimpleHammer.hpp
Weapon.cpp		Weapon.cpp
Weapon.h		Weapon.h
WeaponFactory.cpp		WeaponFactory.cpp
WeaponFactory.h		WeaponFactory.h
main.cpp		main.cpp
reflog.txt		reflog.txt

Provide feedback