Hi Yves Am 08.12.2014 um 12:40 schrieb Yves Blusseau: ... >> committen Sie dann das Ergebnis. >> >> Now the big question is, how to handle the conflicts and what the hell >> are they? > > I think the conflicts are because the files are changed in the repository and > are not in sync with your local versions. > Use git diff to see the differences and resolve the conflicts.
Thart is one of the problems, git diff did not show the differences. Anyway, I somehow managed to get a current status and added the changes again, committed, e.t.c. I was just somehow puzzled that despite my efforts this showed up again. I somehow expected that git detecting conflicts would show them too and not expecting me to find out. Thanks Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
