automation - Git timestamp based automated sync

Question

So I have two laptops sharing a github repo (and the same branch). An automated program on one of the laptops is modifying robot.txt and I am manually modifying math.html on the other laptop.

The question is, assuming both laptops have the correct time, how do I achieve the effect of cp -u with git in an automated bash script? Note that git merge --allow-unrelated-histories is not ideal as I frequently run into the case of manually typing git commands to resolve (non-existent) conflicts.

Answer 1

You could:

• pull changes
• add your changes
• commit these changes
• push changes

Like:

git pull --rebase --autostash &&
git add -A &&
git commit -m "autosync: $(date -R)" &&
git push

With How do I programmatically determine if there are uncommitted changes? you could add a check if there are any changes.