Am 24.10.2016 um 11:00 schrieb Oliver B. Fischer: > Because there is no common ancestor > <http://dict.leo.org/ende/index_de.html#/search=ancestor&searchLoc=0&resultOrder=basic&multiwordShowSingle=on&pos=0> > commit. I get merge conflicts on the remote server.
Does pushing with unrelated histories help? http://stackoverflow.com/questions/39761024/refusing-to-merge-unrelated-histories-failure-while-pulling-to-recovered-repos This solved some problems I had at work and was written in the console when I tried to push. Cheers, Phil
