Hallo! Wie kann ich meine lokalen Ethersex-Dateien aktualisieren?
Auf https://www.ethersex.de/index.php/Quick_Start_Guide/Preparation steht: * Updating a local version of ethersex is possible with: * git pull origin Doch dann bekomme ich folgende Fehlermeldung: root@wickie:/projekte/ethersex# git pull origin M Makefile M config.h M config.in U doc/Configure.help M embed/cfg.ht.m4 M embed/idx.ht.m4 M ethersex.c M hardware/i2c/master/Makefile U hardware/i2c/master/config.in M hardware/i2c/master/i2c_24CXX.c A hardware/i2c/master/i2c_24CXX_ecmd.c A hardware/i2c/master/i2c_24CXX_ecmd.h M hardware/i2c/master/vfs_eeprom.c M hardware/i2c/master/vfs_eeprom.h M hardware/onewire/onewire.c M hardware/storage/dataflash/fs.c M hardware/storage/dataflash/fs.h M hardware/storage/dataflash/vfs_df.c M hardware/storage/dataflash/vfs_df.h M pinning/internals/hackery_atmega16.m4 M pinning/internals/hackery_atmega168.m4 M pinning/internals/hackery_atmega168p.m4 M pinning/internals/hackery_atmega169.m4 M pinning/internals/hackery_atmega32.m4 M pinning/internals/hackery_atmega644.m4 M pinning/internals/hackery_atmega8.m4 M pinning/internals/hackery_atmega88.m4 M protocols/dhcp/dhcp.c M protocols/ecmd/parser.c M protocols/uip/ipstats.c A scripts/avrdude.mk A scripts/avrdude_config.in A scripts/avrdude_config.sh M services/clock/clock_ecmd_date.c M services/jabber/Makefile M services/jabber/config.in M services/jabber/jabber.c M services/jabber/jabber.h M services/jabber/jabber_ecmd.c A services/jabber/jabber_ecmd.h M services/jabber/jabber_state.h M services/jabber/known_buddies.m4 M services/tftp/tftp-vfs.c Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. Please help :-) Danke und Gruß Plinepa
_______________________________________________ Ethersex-devel mailing list Ethersex-devel@list.zerties.org https://list.zerties.org/cgi-bin/mailman/listinfo/ethersex-devel
