Simple App to help @jaspermayone make it through COMP1050 with a professor who won't use version control.

tags

v2.0.3
92249ce8 Jasper Mayone

Release v2.0.3 -----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQSYrJH9XXYhE5mq/PUZJcFmVeV36wUCaYJyCwAKCRAZJcFmVeV3
69YZAQD0dHLdqekxRztO8rchIBY5WQBxdDAHFoyoS2gjBuK/nwD9GPxTFLjVA1XI
0TrtkmydJZ/yQJXEMoViBxS/ZKQJDgE=
=N3Pq
-----END PGP SIGNATURE-----

artifacts

v2.0.2
a24e160b Jasper Mayone

Release v2.0.2 -----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQSYrJH9XXYhE5mq/PUZJcFmVeV36wUCaX/lWgAKCRAZJcFmVeV3
68KIAP0YpkprR7D81Pwhpq8gOoel7Kk/GxePYGabTLFJ1kdK5QEA37t5A63ceV0z
KwMMc4/CRAdTTZsyJFP893riC6du0QQ=
=GGOy
-----END PGP SIGNATURE-----

artifacts

v2.0.1
c5a0bbcd Jasper Mayone

Version 2.0.1 - Bug fixes

- Unstage changes after merge so git add -p works correctly
- Provide cleaner merge commit message template
- Fix compiler warnings
- Fix release script to use existing tags
-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQSYrJH9XXYhE5mq/PUZJcFmVeV36wUCaX0fJAAKCRAZJcFmVeV3
61eLAP0eUKq8GDLjAOzB7v3maHuN22EVUqrNr4FrquBSNTkZVQEAydNEmZ4g8HE3
b68FwuIDScT9cCDMrGV4vqB7I+323gM=
=ul1B
-----END PGP SIGNATURE-----

artifacts

v2.0.0
824ae01f Jasper Mayone

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-----

artifacts

v1.0.0
63b1c3fc Jasper Mayone

Version 1.0.0 - Manual file comparison and merging -----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQSYrJH9XXYhE5mq/PUZJcFmVeV36wUCaX0YpwAKCRAZJcFmVeV3
6xOUAQD/NrNPcOn7KaD1aw05Zk1/BACpS3MSSPjADL8Yx7ALYgEAxvclQ0PpDhI6
CUDAxgpsqS9Qs3nWMFsRfUtHE92BEwM=
=ctI9
-----END PGP SIGNATURE-----

artifacts