search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.48k stars 1.25k forks source link

Path to reference 'branchName' collides with existing one. Error. #886

Closed NikKovIos closed 1 year ago

NikKovIos commented 1 year ago

When trying to fetch all (CMD+SHIFT+F) there is an error.

path to reference 'refs/remotes/origin/branchName' collides with existing one

With terminal command git fetch everything works well. git prune didn't fix it.

Version 1.3.2 (1045)

lucasderraugh commented 1 year ago

Hmm, this does seem to be a new issue, though not reproducible all the time for me. If you have more details on how to reproduce that would be good to know.

NikKovIos commented 1 year ago

Close because hard to reproduce.

lucasderraugh commented 1 year ago

I'm not sure that's a good reason to close it. There are definitely some issues with fetching with the libgit2 changes, I think I'll keep this open as I need to investigate some of these. Worst case I might be reverting everyone back to a 1.3.2 build as the libgit2 changes evidently broke a number of things that weren't caught in tests or during continuous release time.

NikKovIos commented 1 year ago

Our repo was copied from another. So some branches was from another repo. There is a branch called bug/IOS-233 a year ago. git checkout bug/IOS-233 not see it with error: error: pathspec 'bug/IOS-1223/timeInPlayerAfterRewind' did not match any file(s) known to git. And there is a fresh branch buh/IOS-233/someTitle. It exist and it's a branch name from error.

Dark story. 😣

lucasderraugh commented 1 year ago

I believe this should be resolved in 1.3.5. Please reopen if this isn't the case and if you can provide any concrete steps for reproduction, it would be very beneficial.