search

riscvarchive / risc-v-getting-started-guide

The official RISC-V getting started guide
https://risc-v-getting-started-guide.readthedocs.io/en/latest/
Creative Commons Attribution 4.0 International
198 stars 56 forks source link

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

Open sanderjo opened 4 years ago

sanderjo commented 4 years ago 
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?