|
emmapeel
Repository merge failed |
04/15/2018
|
|
emmapeel
Changes pushed |
Changes pushed
04/14/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/14/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/14/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/news/version_3.6.es.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.es.po Auto-merging wiki/src/news/version_2.11.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.11.pt.po Auto-merging wiki/src/news/duckduckgo_challenge.pt.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_first_time.inline.es.po Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/install_final_in_debian.inline.es.po Auto-merging wiki/src/install/inc/steps/install_final.inline.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/install_final.inline.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/persistence.pt.po Auto-merging wiki/src/doc/sensitive_documents/metadata.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.pt.po Auto-merging wiki/src/doc/first_steps/reset/windows.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset/windows.pt.po Auto-merging wiki/src/doc/first_steps/reset/mac.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset/mac.pt.po Auto-merging wiki/src/doc/first_steps/reset/linux.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset/linux.pt.po Auto-merging wiki/src/doc/first_steps/persistence/copy.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/persistence/copy.pt.po Auto-merging wiki/src/doc/anonymous_internet/electrum.es.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/electrum.es.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.es.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.es.po Auto-merging wiki/src/doc/advanced_topics/virtualization.es.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.es.po Auto-merging wiki/src/doc/advanced_topics/additional_software.es.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.es.po Automatic merge failed; fix conflicts and then commit the result. (1)04/13/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/13/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/13/2018 |
|
None
Changes pushed |
Changes pushed
04/12/2018
|
|
emmapeel
Changes pushed |
Changes pushed
04/12/2018
|
|
emmapeel
Changes pushed |
Changes pushed
04/12/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/12/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/12/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/12/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.6.1.pt.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.6.1.pt.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.6.1.fr.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.6.1.fr.po Auto-merging wiki/src/news/version_3.6.2.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.de.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/report_2018_03.mdwn Auto-merging wiki/src/install/mac/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.de.po Auto-merging wiki/src/install/inc/overview.de.po Auto-merging wiki/src/doc/first_steps/reset/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset/mac.de.po Auto-merging wiki/src/doc/first_steps/persistence/check_file_system.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/persistence/check_file_system.de.po Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.de.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.de.po Automatic merge failed; fix conflicts and then commit the result. (1)04/12/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/11/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/11/2018 |
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 04/10/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/09/2018
|
|
emmapeel
Repository merge failed |
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-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.pt.po Auto-merging wiki/src/support/talk.pt.po CONFLICT (content): Merge conflict in wiki/src/support/talk.pt.po Auto-merging wiki/src/support/learn.pt.po CONFLICT (content): Merge conflict in wiki/src/support/learn.pt.po Auto-merging wiki/src/support/faq.pt.po CONFLICT (content): Merge conflict in wiki/src/support/faq.pt.po Auto-merging wiki/src/news/windows_camouflage_jessie.pt.po CONFLICT (content): Merge conflict in wiki/src/news/windows_camouflage_jessie.pt.po Auto-merging wiki/src/news/why_we_need_donations.pt.po CONFLICT (content): Merge conflict in wiki/src/news/why_we_need_donations.pt.po Auto-merging wiki/src/news/who_are_you_helping.pt.po CONFLICT (content): Merge conflict in wiki/src/news/who_are_you_helping.pt.po Auto-merging wiki/src/news/what_we_do_with_your_money.pt.po CONFLICT (content): Merge conflict in wiki/src/news/what_we_do_with_your_money.pt.po Auto-merging wiki/src/news/what_we_accomplished_in_2017.pt.po CONFLICT (content): Merge conflict in wiki/src/news/what_we_accomplished_in_2017.pt.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po Auto-merging wiki/src/news/version_3.5.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.5.pt.po Auto-merging wiki/src/news/version_3.4.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.4.pt.po Auto-merging wiki/src/news/version_3.3.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.3.pt.po Auto-merging wiki/src/news/version_3.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.2.pt.po Auto-merging wiki/src/news/version_3.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.1.pt.po Auto-merging wiki/src/news/version_3.0.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.0.pt.po Auto-merging wiki/src/news/version_3.0.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.0.1.pt.po Auto-merging wiki/src/news/version_2.9.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.9.1.pt.po Auto-merging wiki/src/news/version_2.7.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.7.pt.po Auto-merging wiki/src/news/version_2.7.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.7.1.pt.po Auto-merging wiki/src/news/version_2.6.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.6.pt.po Auto-merging wiki/src/news/version_2.5.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.5.pt.po Auto-merging wiki/src/news/version_2.4.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.4.pt.po Auto-merging wiki/src/news/version_2.3.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.3.pt.po Auto-merging wiki/src/news/version_2.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.2.pt.po Auto-merging wiki/src/news/version_2.2.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.2.1.pt.po Auto-merging wiki/src/news/version_2.12.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.12.pt.po Auto-merging wiki/src/news/version_2.11.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.11.pt.po Auto-merging wiki/src/news/version_2.10.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.10.pt.po Auto-merging wiki/src/news/version_2.0.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.0.pt.po Auto-merging wiki/src/news/version_2.0.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_2.0.1.pt.po Auto-merging wiki/src/news/veracrypt_ux_design.pt.po CONFLICT (content): Merge conflict in wiki/src/news/veracrypt_ux_design.pt.po Auto-merging wiki/src/news/test_redesigned_Tails_Greeter.pt.po CONFLICT (content): Merge conflict in wiki/src/news/test_redesigned_Tails_Greeter.pt.po Auto-merging wiki/src/news/test_incremental_upgrades.pt.po CONFLICT (content): Merge conflict in wiki/src/news/test_incremental_upgrades.pt.po Auto-merging wiki/src/news/test_UEFI.pt.po CONFLICT (content): Merge conflict in wiki/src/news/test_UEFI.pt.po Auto-merging wiki/src/news/test_3.6~rc1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.pt.po Auto-merging wiki/src/news/tails-testers.pt.po CONFLICT (content): Merge conflict in wiki/src/news/tails-testers.pt.po Auto-merging wiki/src/news/spoof-mac.pt.po CONFLICT (content): Merge conflict in wiki/src/news/spoof-mac.pt.po Auto-merging wiki/src/news/social_contract.pt.po CONFLICT (content): Merge conflict in wiki/src/news/social_contract.pt.po Auto-merging wiki/src/news/signing_key_transition.pt.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.pt.po Auto-merging wiki/src/news/rescue_3.0.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/rescue_3.0.1.pt.po Auto-merging wiki/src/news/reproducible_Tails.pt.po CONFLICT (content): Merge conflict in wiki/src/news/reproducible_Tails.pt.po Auto-merging wiki/src/news/our_plans_for_2018.pt.po CONFLICT (content): Merge conflict in wiki/src/news/our_plans_for_2018.pt.po Auto-merging wiki/src/news/our_plans_for_2017.pt.po CONFLICT (content): Merge conflict in wiki/src/news/our_plans_for_2017.pt.po Auto-merging wiki/src/news/new_project_name.pt.po CONFLICT (content): Merge conflict in wiki/src/news/new_project_name.pt.po Auto-merging wiki/src/news/new_SSL_certificate.pt.po CONFLICT (content): Merge conflict in wiki/src/news/new_SSL_certificate.pt.po Auto-merging wiki/src/news/mediapart.pt.po CONFLICT (content): Merge conflict in wiki/src/news/mediapart.pt.po Auto-merging wiki/src/news/many_hands_make_tails.pt.po CONFLICT (content): Merge conflict in wiki/src/news/many_hands_make_tails.pt.po Auto-merging wiki/src/news/logo_contest.pt.po CONFLICT (content): Merge conflict in wiki/src/news/logo_contest.pt.po Auto-merging wiki/src/news/improve_the_infrastructure_behind_Tails.pt.po CONFLICT (content): Merge conflict in wiki/src/news/improve_the_infrastructure_behind_Tails.pt.po Auto-merging wiki/src/news/fpf_campaign.pt.po CONFLICT (content): Merge conflict in wiki/src/news/fpf_campaign.pt.po Auto-merging wiki/src/news/bounties_2013_report.pt.po CONFLICT (content): Merge conflict in wiki/src/news/bounties_2013_report.pt.po Auto-merging wiki/src/news/and_the_winner_is.pt.po CONFLICT (content): Merge conflict in wiki/src/news/and_the_winner_is.pt.po Auto-merging wiki/src/news/amnesia_may_now_work_on_the_Mac.pt.po CONFLICT (content): Merge conflict in wiki/src/news/amnesia_may_now_work_on_the_Mac.pt.po Auto-merging wiki/src/news/additional_software_ux_design.pt.po CONFLICT (content): Merge conflict in wiki/src/news/additional_software_ux_design.pt.po Auto-merging wiki/src/news/Tails_HackFest_2014.pt.po CONFLICT (content): Merge conflict in wiki/src/news/Tails_HackFest_2014.pt.po Auto-merging wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.pt.po CONFLICT (content): Merge conflict in wiki/src/news/Tails_3.0_will_require_a_64-bit_processor.pt.po Auto-merging wiki/src/news/Mac_and_PC_UEFI_hardware_needed.pt.po CONFLICT (content): Merge conflict in wiki/src/news/Mac_and_PC_UEFI_hardware_needed.pt.po Auto-merging wiki/src/news/Join_us_at_the_Tails_HackFest_2014.pt.po CONFLICT (content): Merge conflict in wiki/src/news/Join_us_at_the_Tails_HackFest_2014.pt.po Auto-merging wiki/src/news/IP_leakage_with_Icedove.pt.po CONFLICT (content): Merge conflict in wiki/src/news/IP_leakage_with_Icedove.pt.po Auto-merging wiki/src/news/33c3.pt.po CONFLICT (content): Merge conflict in wiki/src/news/33c3.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-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.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/clone-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.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/os.pt.po CONFLICT (content): Merge conflict in wiki/src/install/os.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-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.pt.po Auto-merging wiki/src/install/mac/dvd.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.pt.po Auto-merging wiki/src/install/mac/dvd-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-overview.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/clone-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.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-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.pt.po Auto-merging wiki/src/install/linux/clone-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.pt.po Auto-merging wiki/src/install/linux.pt.po CONFLICT (content): Merge conflict in wiki/src/install/linux.pt.po Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.pt.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_second_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/install_final.inline.pt.po Auto-merging wiki/src/install/inc/steps/download.inline.pt.po CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.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-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.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/clone-overview.pt.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.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/install/clone.pt.po CONFLICT (content): Merge conflict in wiki/src/install/clone.pt.po Auto-merging wiki/src/install.pt.po CONFLICT (content): Merge conflict in wiki/src/install.pt.po Auto-merging wiki/src/doc/first_steps/upgrade/release_notes.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade/release_notes.pt.po Auto-merging wiki/src/doc/first_steps/startup_options.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.pt.po Auto-merging wiki/src/doc/first_steps/shutdown.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/shutdown.pt.po Auto-merging wiki/src/doc/first_steps/reset.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset.pt.po Auto-merging wiki/src/doc/first_steps/reset.intro.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/reset.intro.pt.po Auto-merging wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po Auto-merging wiki/src/doc/first_steps/bug_reporting.pt.po Auto-merging wiki/src/doc/first_steps/accessibility.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.pt.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)04/09/2018 |
|
emmapeel
Changes pushed |
Changes pushed
04/09/2018
|