search

bwRavencl / ControllerBuddy

Highly advanced game controller mapping
https://controllerbuddy.org
GNU General Public License v3.0
119 stars 10 forks source link

Error: Failed to pull ControllerBuddy-Profiles repository #270

Closed ChunkyChipmunk82 closed 1 month ago

ChunkyChipmunk82 commented 1 month ago

Trying to run the install script, and keep getting this error. I'm not a super tech-savvy person, so I don't exactly know what to do here.

Pulling ControllerBuddy-Profiles repository...
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Error: Failed to pull ControllerBuddy-Profiles repository
ChunkyChipmunk82 commented 1 month ago

nvm im an idiot. apparently i have installed this before. sorry.