Open kaspermarkus opened 14 years ago
Seems like the program automatically resolves a non-automatically-solvable conflict.. When a file in both places have been added and modified:
touch {local,serverroot}/testfile.txt echo "klslkjfsjkskjlfsj" >> {serverroot}/testfile.txt bash repo_sync.sh bash repo_sync.sh
Seems like the program automatically resolves a non-automatically-solvable conflict.. When a file in both places have been added and modified:
touch {local,serverroot}/testfile.txt echo "klslkjfsjkskjlfsj" >> {serverroot}/testfile.txt bash repo_sync.sh bash repo_sync.sh