|
admin
Repository merged |
|
|
admin
Changes pushed |
Changes pushed
03/14/2018
|
|
None
Changes pushed |
Changes pushed
03/14/2018
|
|
None
Changes pushed |
Changes pushed
03/14/2018
|
|
None
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/14/2018 |
|
None
Changes pushed |
Changes pushed
03/14/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Repository rebase failed |
error: Failed to merge in the changes. (128)03/13/2018 |
|
emmapeel
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.6~rc1.torrent Removing wiki/src/torrents/files/tails-amd64-3.6~rc1.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.6.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.6.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.5.torrent Removing wiki/src/torrents/files/tails-amd64-3.5.packages Removing wiki/src/torrents/files/tails-amd64-3.5.iso.sig Removing wiki/src/torrents/files/tails-amd64-3.5.build-manifest Removing wiki/src/lib/software-update-urgent.png Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po Auto-merging po/de.po Auto-merging po/ca.po CONFLICT (content): Merge conflict in po/ca.po Removing config/chroot_sources/stretch-proposed-updates.chroot Removing config/chroot_sources/stretch-proposed-updates.binary Removing config/chroot_local-patches/AppArmor-pin-feature-set.patch Removing config/chroot_local-includes/usr/share/apparmor-features/features.Tails Removing config/chroot_local-hooks/01-check-for-outdated-AppArmor-feature-set Automatic merge failed; fix conflicts and then commit the result. (1)03/13/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/13/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/13/2018
|
Original revision: N/A
New revision: N/A 03/14/2018