Persistent .git File Conflicts

[itsjustmath]

What happened?

I use logseq (the same graph/directory) on my work computer 2020 13" MBP (Intel), and my 2021 14" MBP (M1) and am constantly getting .git file conflicts when switching between machines

Reproduce the Bug

1. Use graph on first computer
2. Use graph on second computer

Expected Behavior

No .git file conflict

Screenshots

Desktop Platform Information

Mac OS: 12.2.1 (21D62), Loseq 0.6.1

Mobile Platform Information

No response

Additional Context

Seems like an iCloud sync issue, wondering if there's a recommended way to avoid it

[cnrpman]

Yes, this is an iCloud issue. It may not be a good practice to use Git and iCloud together.
iCloud's sync behavior is unstable and easy to lead to conflict, and there are more reasons:
https://stackoverflow.com/a/51253959/18352990

Noticed some answers mentioned the "optimize storage" options. May worth a try?

[itsjustmath]

Yes, this is an iCloud issue. It may not be a good practice to use Git and iCloud together. iCloud's sync behavior is unstable and easy to lead to conflict, and there are more reasons: https://stackoverflow.com/a/51253959/18352990

Noticed some answers mentioned the "optimize storage" options. May worth a try?

I will try "optimize storage", it was toggled on my m1 mac — will report back if that fixes it. Thanks @cnrpman!

[cnrpman]

@itsjustmath I happen to read the .git file logic . It is a reference towards the exact .git directory in your user directory.
The issue happens when you have different paths toward the actual .git directory, e.g., different user names.
It's a bit tricky to fix - as the .git reference behavior is defined by git.

[itsjustmath]

@itsjustmath I happen to read the .git file logic . It is a reference towards the exact .git directory in your user directory. The issue happens when you have different paths toward the actual .git directory, e.g., different user names. It's a bit tricky to fix - as the .git reference behavior is defined by git.

I actually changed user names on both devices to have the same username, alas it still persisted. iCloud seems very finicky. Probably why services like Alfred don't recommend it