CharlesChiuGit / Logseq-Git-Sync-101

This repo aims to help Logseq users to sync their data with Git and GitHub.
MIT License
1.06k stars 88 forks source link

Update pre-commit to avoid error messages on pull #39

Closed nfr97 closed 8 months ago

nfr97 commented 8 months ago

Previously, when pulling new changes from remote, an error would appear due to a head mismatch, from the local repo being behind the remote. This change makes it so that no longer happens, but new changes are still brought in. It does this using Merge.

Please feel free to improve this code. I am no pro. I just used Google Bard to help get rid of the annoying error messages. Thank you for the resources to integrate Git and Logseq, I love it!