mirror of
https://github.com/zoo-apps/vote.git
synced 2026-10-30 14:56:32 +00:00
zeekay
f2503cc892
- Full app extraction from zoo monorepo (source only) - Configured for GitHub Pages deployment - Static export enabled - Custom domain: vote.zoo.ngo - Excludes node_modules and build artifacts
37 lines
926 B
Bash
Executable File
37 lines
926 B
Bash
Executable File
#!/bin/bash
|
|
|
|
# Fix merge conflicts by choosing the 'develop' branch version (luxdao)
|
|
echo "Fixing merge conflicts in app files..."
|
|
|
|
# Find all files with merge conflicts
|
|
files=$(find src -type f \( -name "*.ts" -o -name "*.tsx" \) -exec grep -l "<<<<<<< HEAD" {} \;)
|
|
|
|
for file in $files; do
|
|
echo "Fixing: $file"
|
|
# Create a temporary file
|
|
temp_file="${file}.tmp"
|
|
|
|
# Process the file to remove conflict markers and keep 'develop' version
|
|
awk '
|
|
/^<<<<<<< HEAD$/ { in_conflict = 1; next }
|
|
/^=======$/ {
|
|
if (in_conflict) {
|
|
in_conflict = 0
|
|
in_develop = 1
|
|
next
|
|
}
|
|
}
|
|
/^>>>>>>> develop$/ {
|
|
if (in_develop) {
|
|
in_develop = 0
|
|
next
|
|
}
|
|
}
|
|
!in_conflict { print }
|
|
' "$file" > "$temp_file"
|
|
|
|
# Replace the original file
|
|
mv "$temp_file" "$file"
|
|
done
|
|
|
|
echo "✅ All merge conflicts fixed!" |