Пост #156246 |
сохранен 12.12.2020 17:39
- Редактировать пост
- Печать
- Скачать
- Посты-ответы на этот пост: # 202144 # 268763 # 275143
- Посмотреть дерево постов
-
Сравнить с постом
#
Текст поста
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | sudo emerge --sync jorgicio Пароль: --- Invalid atom in /etc/portage/package.mask/custom: *::jorgicio --- Invalid atom in /etc/portage/package.unmask/custom: telegram-cli-99999999::jorgicio >>> Syncing repository 'jorgicio' into '/var/db/repos/jorgicio'... /usr/bin/git fetch origin remote: Enumerating objects: 35, done. remote: Counting objects: 100% (35/35), done. remote: Compressing objects: 100% (22/22), done. remote: Total 30 (delta 17), reused 15 (delta 2), pack-reused 0 Unpacking objects: 100% (30/30), 2.55 KiB | 174.00 KiB/s, done. From https://github.com/gentoo-mirror/jorgicio 6dd100ab..4b4c7dd0 master -> origin/master error: Merging 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. !!! git merge error in /var/db/repos/jorgicio --- Invalid atom in /etc/portage/package.mask/custom: *::jorgicio --- Invalid atom in /etc/portage/package.unmask/custom: telegram-cli-99999999::jorgicio Action: sync for repo: jorgicio, returned code = 128 |