AtomiKe

Repository merge failed

 
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages
Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig
Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent
Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig
Auto-merging wiki/src/press.pt.po
CONFLICT (content): Merge conflict in wiki/src/press.pt.po
Auto-merging wiki/src/press.fr.po
CONFLICT (content): Merge conflict in wiki/src/press.fr.po
Auto-merging wiki/src/news/signing_key_transition.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po
Auto-merging wiki/src/news/report_2015_07.mdwn
Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po
Auto-merging wiki/src/doc/first_steps/start_tails.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po
Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn
Removing features/images/UnsafeBrowserWindow.png
Removing features/images/UnsafeBrowserPreferencesMenuItem.png
Removing features/images/UnsafeBrowserEditPreferences.png
Removing features/images/UnsafeBrowserEditMenu.png
Removing features/images/UnsafeBrowserAdvancedSettings.png
Removing features/images/USBSuggestsInstall.png
Removing features/images/TorBrowserUnableToOpen.png
Removing features/images/TailsInstallerNoDevice.png
Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff
Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff
Automatic merge failed; fix conflicts and then commit the result. (1)
08/28/2015
None

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/05/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/02/2015
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/02/2015
emmapeel

Changes pushed
Changes pushed 08/01/2015
None

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/01/2015
None

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/01/2015
None

Resource updated
The “wiki/src/index.fr.po” file was changed. 08/01/2015
None

Resource updated
The “wiki/src/index.de.po” file was changed. 08/01/2015
None

Resource updated
The “wiki/src/index.es.po” file was changed. 08/01/2015
None

Resource updated
The “wiki/src/index.fa.po” file was changed. 08/01/2015
None

Resource updated
The “wiki/src/index.it.po” file was changed. 08/01/2015
None

Resource updated
The “wiki/src/index.pt.po” file was changed. 08/01/2015
None

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/01/2015
None

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 08/01/2015

Search