6 ms·
What kind of weird conflicts? My GitRepos are in my My Documents folder and that folder is backed up to Dropbox. But I haven't synced the git folder to my lapto
by iKnowKungFoo 14y ago
What kind of weird conflicts? My GitRepos are in my My Documents folder and that folder is backed up to Dropbox. But I haven't synced the git folder to my laptop yet.
- fdb 14y agoIn the .git folder, I have multiple of these files: FETCH_HEAD FETCH_HEAD (mba's conflicted copy 2012-05-30 (1)) FETCH_HEAD (mba's conflicted copy 2012-05-30 (2)) FETCH_HEAD (mba's conflicted copy 2012-05-30 (3)) FETCH_HEAD (mba's conflicted copy 2012-05-30 (4)) index index (mba's conflicted copy 2012-05-30 (1)) index (mba's conflicted copy 2012-05-30 (2)) index (osyMac's conflicted copy 2012-05-30 (2)) index (osyMac's conflicted copy 2012-05-30 (3)) index (osyMac's conflicted copy 2012-05-30 (4))
- lscott3 14y agoYeah, I was running into that as well. I have quite a few machines hooked up to it so it becomes a real pain. I just started using a private github repo.