Internal git operations

Tiki Wiki

Clean Rewind Procedure (docwikiilis_tiki29 sample)

1. Find the last good merge
   git log --oneline --merges -10
   Identify the merge commit before the problematic one.
2. Reset to the good merge
   git reset --hard <commit-hash>
   Example: git reset --hard 0ad7cd3
3. Verify your custom files
   ls -la _custom/shared/
   If missing, restore them:
   git checkout <latest-merge-commit> -- _custom/ .user.ini
4. Clean rebuild (critical!)
   rm -rf node_modules
rm -rf vendor_bundled/vendor
rm -rf src/js/vue-widgets/element-plus-ui/node_modules
rm -f temp/cache/container.php
rm -f package-lock.json
sh setup.sh -n build
5. If patch errors occur
   Check which package version is expected:
   ls src/js/patches/
   Example: element-plus+2.9.7.patch means version 2.9.7 is required.
   Find where the package is defined:
   grep -r "element-plus" --include="package.json" .
   Lock the version (remove the ^):
   Example for element-plus
   sed -i 's/"element-plus": "\^[0-9.]*"/"element-plus": "2.9.7"/' src/js/vue-widgets/element-plus-ui/package.json
   Then repeat Step 4.
6. If package is in wrong location
   npm install <package-name>@<version> --save-dev
   Then repeat Step 4.

Quick Reference

Action	Command
Find merges	git log --oneline --merges -10
Reset	git reset --hard <hash>
Check custom files	ls -la _custom/shared/
Find patches	ls src/js/patches/
Full clean	rm -rf node_modules vendor_bundled/vendor temp/cache/container.php package-lock.json
Rebuild	sh setup.sh -n build