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.

Am 24.10.16 um 07:52 schrieb Anatole Tresch:
Lets discuss it at our hangout later. I dont see as of now any reason why
recreation is necessary...

J Anatole

Am 24.10.2016 02:37 schrieb "John D. Ament" <[email protected]>:

You need to give me more info Oliver.  What are we doing with the current
code?  Can you push your new tree to a branch in this repo and I can ask
infra to swap them?

On Sun, Oct 23, 2016 at 5:45 PM Oliver B. Fischer <
[email protected]>
wrote:

push
incubator-tamaya-extensions (
extensions.git

--
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

Reply via email to