Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

"git checkout v3.0.0" error: The following untracked working tree files would be overwritten by checkout: slirp/COPYRIGHT #16

Open
sanderjo opened this issue Nov 26, 2019 · 0 comments

Comments

@sanderjo
Copy link
Contributor

root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain# cd qemu
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu# git checkout v3.0.0
error: The following untracked working tree files would be overwritten by checkout:
        slirp/COPYRIGHT
Please move or remove them before you switch branches.
Aborting
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu# ./configure --target-list=riscv64-softmmu^C
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu#

So ... try:

root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu#
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu# mv slirp/COPYRIGHT slirp/COPYRIGHT.org
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu# git checkout v3.0.0
warning: unable to rmdir 'roms/edk2': Directory not empty
warning: unable to rmdir 'slirp': Directory not empty
warning: unable to rmdir 'tests/fp/berkeley-softfloat-3': Directory not empty
warning: unable to rmdir 'tests/fp/berkeley-testfloat-3': Directory not empty
Checking out files: 100% (5361/5361), done.
M       dtc
M       roms/QemuMacDrivers
M       roms/SLOF
M       roms/ipxe
M       roms/openbios
M       roms/qemu-palcode
M       roms/seabios
M       roms/seabios-hppa
M       roms/skiboot
M       roms/u-boot
Previous HEAD position was 57dfc2c4d5 Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190704-1' into staging
HEAD is now at 38441756b7 Update version for v3.0.0 release
root@6f42517b2121:/riscv64-linux/riscv-gnu-toolchain/qemu#

Is that good?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant