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.
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))I just started using a private github repo.