mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added a comment

Browse source
This commit is contained in:
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4 2023-02-09 14:22:19 +00:00 • committed by admin
parent 98cd2e0c49
commit e2c5820017
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
doc/bugs/adjusted__47__main__40__unlocked__41___not_syncing_with_main/comment_1_e5ebc1cf8621761b559d53884731d0e3._comment Normal file
View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4"
nickname="rshalaev"
avatar="http://cdn.libravatar.org/avatar/d7f181d338cbcef7418faa01f0441e86"
subject="comment 1"
date="2023-02-09T14:22:19Z"
content="""
Update:
I was able to resolve the problem - believe that it was caused by the fact that I changed branch name from `master` to `main` and had leftover `refs/basis/adjusted/master(unlocked)`.
Resolved following this steps:
```
git switch main
git annex merge \"adjusted/main(unlocked)\"
git branch -D \"adjusted/main(unlocked)\"
rm -rf .git/refs/basis/*
git annex adjust --unlocked
```
Tested that sync is now working
"""]]