Re: git am : fatal: Geänderter Index: kann Patches nicht anwenden

[Robert Langhammer]

Hallo,

wenn git meldet
fatal: Geänderter Index: kann Patches nicht anwenden.....
weil sich zB. das buldscript geändert hat, wie kann man da vorgehen?
Ich habe den Patch von Hand rein getippt, ist ja nicht viel. Aber was 
würde man bei einem Großen machen?

Robert


On 27.02.2016 18:26, Tim Niemeyer wrote:
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> Cc: Robert <rlanghammer at web.de>
> ---
>
>   src/packages/fff/fff-tunneldigger/Makefile | 40 ++++++++++++++++++++++++++++++
>   1 file changed, 40 insertions(+)
>   create mode 100644 src/packages/fff/fff-tunneldigger/Makefile
>
> diff --git a/src/packages/fff/fff-tunneldigger/Makefile b/src/packages/fff/fff-tunneldigger/Makefile
> new file mode 100644
> index 0000000..0526e7b
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/Makefile
> @@ -0,0 +1,40 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-tunneldigger
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-tunneldigger
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-tunneldigger
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:= Freifunk-Franken tunneldigger
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+tunneldigger
> +endef
> +
> +define Package/fff-tunneldigger/description
> +    This is tunneldigger for the Freifunk Franken Firmware
> +	Currently this package is a placeholder
> +endef
> +
> +define Build/Prepare
> +	echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +	# nothing
> +endef
> +
> +define Build/Compile
> +	# nothing
> +endef
> +
> +define Package/fff-tunneldigger/install
> +    # nothing
> +endef
> +
> +$(eval $(call BuildPackage,fff-tunneldigger))