Moving or removing ports due to merge error??

Started by mkono87, October 29, 2021, 04:27:08 PM

Previous topic - Next topic
Tried getting the ports so I could install tailscale on opnsense but I have this problem where it tells me to move or remove the files. Is it just a matter of removing the ports directory?

error: The following untracked working tree files would be removed by merge:
devel/google-gdata/Makefile
devel/google-gdata/distinfo
devel/google-gdata/files/patch-Makefile
devel/google-gdata/files/patch-src_gapps_auditservice.cs
devel/google-gdata/pkg-descr
editors/kakoune/files/patch-src_main.cc
emulators/vpcs/Makefile
emulators/vpcs/distinfo
emulators/vpcs/pkg-descr
Please move or remove them before you merge.
Aborting
root@OPNsense:~ #