Keep getting conflicts generated on Android device for files modified only on a desktop PC

Could be the inode change time check, which is new. If the underlying FS doesn’t support it, like FAT, it probably returns the mtime instead, which is fine. If the underlying FS is a lie and the mtime/inode-change-time fluctuates, as might be the case on Android, weird things will happen. Maybe we should disable that code on Android. You, as a self-compiler, might try to add a if runtimeos.IsAndroid { return time.Time{} } at the top of (basicFileInfo)InodeChangeTime() in fs/basicfs_fileinfo_linuxish.go.