Сравнение постов
Различия между постами
#156246 (12.12.2020 17:39)
и
#275143 (02.06.2024 12:31).
| 1 | sudo emerge --sync jorgicio | |
| 2 | Пароль: | |
| 3 | --- Invalid atom in /etc/portage/package.mask/custom: *::jorgicio | |
| 4 | --- Invalid atom in /etc/portage/package.unmask/custom: telegram-cli-99999999::jorgicio | |
| 5 | >>> Syncing repository 'jorgicio' into '/var/db/repos/jorgicio'... | |
| 6 | /usr/bin/git fetch origin | |
| 7 | remote: Enumerating objects: 35, done. | |
| 8 | remote: Counting objects: 100% (35/35), done. | |
| 9 | remote: Compressing objects: 100% (22/22), done. | |
| 10 | remote: Total 30 (delta 17), reused 15 (delta 2), pack-reused 0 | |
| 11 | Unpacking objects: 100% (30/30), 2.55 KiB | 174.00 KiB/s, done. | |
| 1 | Экскурсии по Москве https://dimar-guide.ru/moscow | |
| 2 | ||
| 3 | Бункер Сталина https://dimar-guide.ru/ekskursii-na-avtobuse-po-podmoskovyu | |
| 4 | ||
| 5 | 3 экскурсии https://dimar-guide.ru/osenniy-centr-stolicy-moskovskiy-kreml | |
| 6 | ||
| 7 | Круиз на теплоходе-ресторане от Radisson https://dimar-guide.ru/chastniy-gid-v-moskve-s-mashinoy | |
| 8 | ||
| 9 | Пешеходная https://dimar-guide.ru/ekskursii-na-avtobuse-po-podmoskovyu | |
| 10 | ||
| 11 | Гид, экскурсовод! | |
| 12 | From https://github.com/gentoo-mirror/jorgicio | |
| 13 | 6dd100ab..4b4c7dd0 master -> origin/master | |
| 14 | error: Merging is not possible because you have unmerged files. | |
| 15 | hint: Fix them up in the work tree, and then use 'git add/rm | |
| 16 | hint: as appropriate to mark resolution and make a commit. | |
| 17 | fatal: Exiting because of an unresolved conflict. | |
| 18 | !!! git merge error in /var/db/repos/jorgicio | |
| 19 | --- Invalid atom in /etc/portage/package.mask/custom: *::jorgicio | |
| 20 | --- Invalid atom in /etc/portage/package.unmask/custom: telegram-cli-99999999::jorgicio | |
| 21 |