> mega@leafbuilder:~/leaf/devel/bering-uclibc$ git pull > Password: > remote: Counting objects: 84, done. > remote: Compressing objects: 100% (55/55), done. > remote: Total 55 (delta 34), reused 0 (delta 0) > Unpacking objects: 100% (55/55), done. > Von ssh://git.code.sf.net/p/leaf/bering-uclibc > 693104c..a28abaf maint -> origin/maint > 0fa3dd4..729eff1 master -> origin/master > * [neues Tag] v5.1.2 -> v5.1.2 > > > automatischer Merge von repo/webconf/var/webconf/www/interfaces.css > automatischer Merge von repo/webconf/var/webconf/www/interfaces.cgi > KONFLIKT (Inhalt): Merge-Konflikt in > repo/webconf/var/webconf/www/interfaces.cgi > automatischer Merge von repo/webconf/var/webconf/www/interfaces.blurb > KONFLIKT (Inhalt): Merge-Konflikt in > repo/webconf/var/webconf/www/interfaces.blurb > Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und > 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. Then readd the conflicts files before pushing them. Regards, Yves ------------------------------------------------------------------------------ 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
