You do not have permission to access this repository.You may need to log out and log back in to refresh your token.You are not logged in to your account: see File > Options.(The error was parsed as 3: Authentication failed. T10:03:15.752Z - error: git -c credential.helper= fetch -progress -prune origin exited with an unexpected code: 128. T10:03:15.747Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 4.315s) T10:02:01.177Z - info: : Refreshing sidebar indicators for 20 repositories took 80.1s of which 1621.1s paused, total 1701.3s T10:02:01.046Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 2.897s) T10:01:57.821Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.440s) T10:01:53.840Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.088s) T10:01:50.463Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 4.914s) T10:01:45.241Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.047s) T10:01:41.369Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.987s) T10:01:37.062Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.423s) T10:01:33.147Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.463s) T10:01:31.402Z - info: skipping fast-forward for all branches as there are 20 eligible branches (Threshold is 20 eligible branches). T10:01:29.576Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 7.931s) T10:01:29.298Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 3.627s) T10:01:25.286Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 5.822s) T10:01:24.244Z - info: skipping fast-forward for all branches as there are 21 eligible branches (Threshold is 20 eligible branches). T10:01:22.214Z - info: Executing fetch: git -c credential.helper= fetch -progress -prune origin (took 7.246s) I deleted local branches that are gone in origin, in case it will help. Looking at the “config” file for this repo, I see it has 22 ‘branch’ blocks there, and the branch I want to merge from is nr 17, and my branch is nr 18. Why does it always detect changes on master, but not on the other branch? Then switched back to my branch, and now the merge detected changes! I see there are 180+ Pulls to do, so Pressed “Pull with Rebase”. Still "up to date" (wrongly).Īs an experiment, I switched to the Branch I want to merge from. That branch I want to merge from has been recently made up to date with master. Says 26 commits (that’s from ‘master’ actually, which is the default), then right after “up to date”, when it checks against the stack I want to merge from. No logs seem to be written when I select the branch to merge from. I'll let you know when I reproduce the original issue in my other environment, where I can only get the commits merged if I go on Azure DevOps and do a Pull Request (i.e., don't close this issue yet) I suppose it's because of "autosetupmerge" being true (correct me if wrong). Seems the branch contains the commits done in master, so in this case, there are no problems here. I don't see any logs being triggered when I try to merge and it doesn't find anything new.ĮDIT - ah, hold on! In this case, this branch is a 100% local one (doesn't exist remotely). removing the setting doesn't seem to help fixing the issue anyway. T19:33:54.383Z - warn: Unexpected value found for pull.rebase in config: 'merges'īut, as far as I can see, "rebase = merges" is a valid option, isn't it?Īnd seems to be the recommended setting in several articles I see. "This branch is up to date", when it clearly isn't. I'm trying to merge master to my current branch. So, in gitconfig for this repo in specific, I have: I've just experienced this in one of my repos - it's not the same repo I was having the issue with before, but might be the same issue anyway.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |