openwrt_git_pull命令提示merger冲突时如何解决？
直接贴代码
tf@ubuntu:~/projects/openwrt1407$ git pull Updating 331ecb0..d12dc6e error: Your local changes to the following files would be overwritten by merge: target/linux/ar71xx/base-files/lib/ar71xx.sh target/linux/ar71xx/base-files/lib/upgrade/platform.sh target/linux/ar71xx/config-3.10 target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c target/linux/ar71xx/image/Makefile Please, commit your changes or stash them before you can merge. Aborting tf@ubuntu:~/projects/openwrt1407$ git stash *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'tf@ubuntu.(none)') Cannot save the current index state tf@ubuntu:~/projects/openwrt1407$ git config --global user.email "lmgames@163.com" tf@ubuntu:~/projects/openwrt1407$ git config --global user.name "tf" tf@ubuntu:~/projects/openwrt1407$ git stash Saved working directory and index state WIP on master: 331ecb0 mac80211: fix HT mode selection for ad-hoc HEAD is now at 331ecb0 mac80211: fix HT mode selection for ad-hoc tf@ubuntu:~/projects/openwrt1407$ git pull ^[^AUpdating 331ecb0..d12dc6e Fast-forward package/libs/openssl/Makefile | 6 +- package/libs/openssl/patches/150-no_engines.patch | 18 +- .../libs/openssl/patches/200-parallel_build.patch | 8 +- package/libs/polarssl/Makefile | 7 +- .../polarssl/patches/210-gen_key_config_fix.patch | 38 ---- .../libs/polarssl/patches/300-CVE-2015-1182.patch | 11 ++ package/network/config/qos-scripts/Makefile | 4 +- package/network/ipv6/map/Makefile | 7 +- package/network/ipv6/map/files/map.sh | 3 + package/network/ipv6/map/src/mapcalc.c | 6 +- package/network/services/openvpn/Makefile | 4 +- .../patches/001-backport_cipher_none_fix.patch | 57 ++++++ target/linux/ar71xx/base-files/etc/diag.sh | 4 + .../ar71xx/base-files/etc/uci-defaults/01_leds | 11 ++ .../ar71xx/base-files/etc/uci-defaults/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-3.10 | 1 + .../ar71xx/files/arch/mips/ath79/mach-dragino2.c | 43 +++-- .../files/arch/mips/ath79/mach-tl-wa701nd-v2.c | 116 +++++++++++++ target/linux/ar71xx/image/Makefile | 4 +- .../patches-3.10/728-MIPS-ath79-fix-restart.patch | 10 ++ .../729-MIPS-ath79-add-TL-WA701NDv2-support.patch | 45 +++++ .../patches-3.10/070-net_bridge_backports.patch | 193 +++++++++++++++++---- .../644-bridge_optimize_netfilter_hooks.patch | 6 +- tools/firmware-utils/src/mktplinkfw.c | 6 + 26 files changed, 492 insertions(+), 121 deletions(-) delete mode 100644 package/libs/polarssl/patches/210-gen_key_config_fix.patch create mode 100644 package/libs/polarssl/patches/300-CVE-2015-1182.patch create mode 100644 package/network/services/openvpn/patches/001-backport_cipher_none_fix.patch create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa701nd-v2.c create mode 100644 target/linux/ar71xx/patches-3.10/729-MIPS-ath79-add-TL-WA701NDv2-support.patch tf@ubuntu:~/projects/openwrt1407$ git stash pop Auto-merging target/linux/ar71xx/image/Makefile Auto-merging target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c CONFLICT (content): Merge conflict in target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c Auto-merging target/linux/ar71xx/config-3.10 Auto-merging target/linux/ar71xx/base-files/lib/upgrade/platform.sh Auto-merging target/linux/ar71xx/base-files/lib/ar71xx.sh tf@ubuntu:~/projects/openwrt1407$
