Simple App to help @jaspermayone make it through COMP1050 with a professor who won't use version control.
Version 2.0.0 - Git merge workflow
Major refactor to use git's native merge capabilities:
- Extracts zip to temporary branch
- Initiates git merge with --no-commit
- User can selectively stage hunks with git add -p
- Much cleaner workflow leveraging git's power
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSYrJH9XXYhE5mq/PUZJcFmVeV36wUCaX0bYAAKCRAZJcFmVeV3
6y4iAP46mnI3HQHB45e5iq1jbhoSJ3fnO6D/6wOWEbG+qHpo5gD+PGqpjjSP6KE0
0h6Sdimb5uC3WHWYUl5Tm8/H7W37ig0=
=sp7/
-----END PGP SIGNATURE-----