Hi all,
I tried it it again and now it seems to be fine. At least master points
to the latest commit.
Can someone clone/update
https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git
and try to build it?
Oliver
Am 24.10.16 um 20:14 schrieb P. Ottlinger:
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
--
N Oliver B. Fischer
A Schönhauser Allee 64, 10437 Berlin, Deutschland/Germany
P +49 30 44793251
M +49 178 7903538
E [email protected]
S oliver.b.fischer
J [email protected]
X http://xing.to/obf
