|
emmapeel
Changes pushed |
Changes pushed
05/09/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/09/2018
|
|
None
Changes pushed |
Changes pushed
05/09/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/09/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/install_final_in_debian.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po Auto-merging wiki/src/install/inc/steps/debian_requirements.inline.fa.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)05/09/2018 |
|
emmapeel
Changes pushed |
Changes pushed
05/08/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po Auto-merging wiki/src/upgrade.it.po CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po Auto-merging wiki/src/upgrade.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade.fr.po Auto-merging wiki/src/upgrade.fa.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/install/win/usb.es.po Auto-merging wiki/src/install/win/usb-overview.it.po Auto-merging wiki/src/install/win/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.fr.po Auto-merging wiki/src/install/win/usb-overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po Auto-merging wiki/src/install/win/clone-overview.it.po Auto-merging wiki/src/install/win/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.fr.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.it.po CONFLICT (content): Merge conflict in wiki/src/install/win.it.po Auto-merging wiki/src/install/win.fr.po CONFLICT (content): Merge conflict in wiki/src/install/win.fr.po Auto-merging wiki/src/install/win.fa.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Removing wiki/src/install/os.pt.po Removing wiki/src/install/os.it.po Removing wiki/src/install/os.html Removing wiki/src/install/os.fr.po CONFLICT (modify/delete): wiki/src/install/os.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/os.fa.po left in tree. Removing wiki/src/install/os.es.po Removing wiki/src/install/os.de.po Auto-merging wiki/src/install/mac/usb-overview.it.po Auto-merging wiki/src/install/mac/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.fr.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/dvd-overview.it.po Auto-merging wiki/src/install/mac/dvd-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.fr.po Auto-merging wiki/src/install/mac/dvd-overview.fa.po Auto-merging wiki/src/install/mac/dvd-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.de.po Auto-merging wiki/src/install/mac/clone-overview.it.po Auto-merging wiki/src/install/mac/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.fr.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb-overview.it.po Auto-merging wiki/src/install/linux/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.fr.po Auto-merging wiki/src/install/linux/usb-overview.fa.po Auto-merging wiki/src/install/linux/clone-overview.it.po Auto-merging wiki/src/install/linux/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.fr.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/linux.it.po CONFLICT (content): Merge conflict in wiki/src/install/linux.it.po Auto-merging wiki/src/install/linux.fr.po CONFLICT (content): Merge conflict in wiki/src/install/linux.fr.po Auto-merging wiki/src/install/linux.fa.po Auto-merging wiki/src/install/linux.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux.de.po Removing wiki/src/install/inc/stylesheets/router-install.css Auto-merging wiki/src/install/expert/usb-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.pt.po Auto-merging wiki/src/install/expert/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.fr.po Auto-merging wiki/src/install/debian/usb-overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.it.po Auto-merging wiki/src/install/debian/usb-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.fr.po Auto-merging wiki/src/install/debian/clone-overview.it.po Auto-merging wiki/src/install/debian/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.fr.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging wiki/src/install/debian.it.po Auto-merging wiki/src/install/debian.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian.fr.po Auto-merging wiki/src/install/debian.fa.po Auto-merging wiki/src/install/debian.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian.de.po Auto-merging wiki/src/install.it.po CONFLICT (content): Merge conflict in wiki/src/install.it.po Auto-merging wiki/src/install.fa.po CONFLICT (content): Merge conflict in wiki/src/install.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)05/08/2018 |
|
emmapeel
Changes pushed |
Changes pushed
05/07/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 05/07/2018 |
|
emmapeel
Changes pushed |
Changes pushed
05/07/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 05/07/2018 |
|
None
Changes pushed |
Changes pushed
05/05/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/upgrade/tails.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.pt.po Auto-merging wiki/src/upgrade/tails-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.pt.po Auto-merging wiki/src/upgrade/tails-download.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.pt.po Auto-merging wiki/src/upgrade/clone.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.pt.po Auto-merging wiki/src/upgrade/clone-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.pt.po Auto-merging wiki/src/upgrade.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade.pt.po Auto-merging wiki/src/torrents.pt.po CONFLICT (content): Merge conflict in wiki/src/torrents.pt.po Auto-merging wiki/src/support/known_issues/graphics.pt.po Auto-merging wiki/src/support/known_issues.pt.po Auto-merging wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/faq.pt.po CONFLICT (content): Merge conflict in wiki/src/support/faq.pt.po Auto-merging wiki/src/install/win/usb.pt.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.pt.po Auto-merging wiki/src/install/win/usb-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.pt.po Auto-merging wiki/src/install/win.pt.po CONFLICT (content): Merge conflict in wiki/src/install/win.pt.po Auto-merging wiki/src/install/vm-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.pt.po Auto-merging wiki/src/install/mac/usb.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.pt.po Auto-merging wiki/src/install/mac/usb-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.pt.po Auto-merging wiki/src/install/mac/dvd-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.pt.po Auto-merging wiki/src/install/mac/clone.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone.pt.po Auto-merging wiki/src/install/mac.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac.pt.po Auto-merging wiki/src/install/linux/usb.pt.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.pt.po Auto-merging wiki/src/install/linux/usb-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.pt.po Auto-merging wiki/src/install/expert/usb.pt.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.pt.po Auto-merging wiki/src/install/dvd-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.pt.po Auto-merging wiki/src/install/download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/download.pt.po Auto-merging wiki/src/install/debian/usb.pt.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.pt.po Auto-merging wiki/src/install/debian/usb-download.pt.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.pt.po Auto-merging wiki/src/install/debian.pt.po CONFLICT (content): Merge conflict in wiki/src/install/debian.pt.po Auto-merging wiki/src/doc/advanced_topics/wireless_devices.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.pt.po Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.pt.po Auto-merging wiki/src/doc/advanced_topics/paperkey.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.pt.po Auto-merging wiki/src/doc/advanced_topics/lan.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/lan.pt.po Auto-merging wiki/src/doc/advanced_topics/additional_software.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.pt.po Auto-merging wiki/src/doc/about/warning.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/warning.pt.po Auto-merging wiki/src/doc/about/openpgp_keys.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/openpgp_keys.pt.po Auto-merging wiki/src/doc/about.index.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about.index.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)05/05/2018 |
|
emmapeel
Changes pushed |
Changes pushed
05/05/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/05/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/05/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/upgrade/tails.pt.po Auto-merging wiki/src/upgrade/tails.it.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.it.po Auto-merging wiki/src/upgrade/tails.fr.po Auto-merging wiki/src/upgrade/tails.fa.po Auto-merging wiki/src/upgrade/tails.es.po Auto-merging wiki/src/upgrade/tails.de.po Auto-merging wiki/src/install/win/usb.es.po Auto-merging wiki/src/install/linux/usb.pt.po Auto-merging wiki/src/install/linux/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.it.po Auto-merging wiki/src/install/linux/usb.fr.po Auto-merging wiki/src/install/linux/usb.fa.po Auto-merging wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.fa.po Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.es.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.es.po Auto-merging wiki/src/install/inc/steps/not_at_all.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/inc/steps/create_persistence.inline.fa.po Auto-merging wiki/src/install/inc/steps/create_persistence.inline.de.po Auto-merging wiki/src/install/debian/usb.pt.po Auto-merging wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.es.po Auto-merging wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)05/05/2018 |
|
emmapeel
Changes pushed |
Changes pushed
05/03/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/03/2018
|
|
emmapeel
Changes pushed |
Changes pushed
05/03/2018
|