Git conflicted copy error while sync by Dropbox

Problem I save my repo in dropbox, and one day (see date below) it went crazy. Now I get these warning every time I try to autocomplete a branch name I am using Dropbox to sync a git repository, but now when I try and push I am getting an error: fatal: Reference has invalid format: 'refs/heads/master (MacBook-Pro's conflicted copy 2015-06-11)' Fixing So, it seems that Dropbox detected a conflict and created a copy. Ok, no problem, so I deleted the conflicted file. Still, getting the......

我们谈论图书馆之城时, 在谈论什么?

有人读书全城预约传送馆外访问二维码证电子文献传送

你不可不知的效率工作方法:用KPTP法来工作总结

工作总结的目的就是让自己明白,也让别人明白: 1.做了什么 2.有什么问题 3.怎么解决 4.接下去怎么做 工作总结是为了更好的工作,工作怎么做,工作总结就要怎......