Simple App to help @jaspermayone make it through COMP1050 with a professor who won't use version control.
Swift
64.1%
Shell
10.1%
Other
25.8%
6
1
5
Clone this repository
https://tangled.org/jaspermayone.com/ZipMerge
https://tangled.org/did:plc:abgthiqrd7tczkafjm4ennbo/ZipMerge
git@knot.jaspermayone.com:jaspermayone.com/ZipMerge
git@knot.jaspermayone.com:did:plc:abgthiqrd7tczkafjm4ennbo/ZipMerge
For self-hosted knots, clone URLs may differ based on your setup.
Download tar.gz
- Replace manual file comparison with git-based workflow
- Extract zip to temporary branch and initiate merge
- User can now use git add -p for selective hunk staging
- Simplify UI to show merge instructions
- Include hidden files (important for Eclipse projects)
- Skip .git, .DS_Store, and __MACOSX directories
- Update app version to 2.0.0