emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/press/media_appearances_2015.fr.po
Auto-merging wiki/src/news.fr.po
CONFLICT (content): Merge conflict in wiki/src/news.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
Removing wiki/src/blueprint/TailsGreeter/blog.mdwn
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/press/media_appearances_2015.fr.po
Auto-merging wiki/src/news.fr.po
CONFLICT (content): Merge conflict in wiki/src/news.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
Auto-merging wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
Removing wiki/src/blueprint/TailsGreeter/blog.mdwn
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 10 years ago
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 10 years ago
u

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
u

Repository merge failed

Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
u

Repository merge failed

Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Changes pushed

Changes pushed 10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/news/report_2015_05.mdwn
Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago
emmapeel

Repository merge failed

Auto-merging wiki/src/doc/about/features.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/features.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
10 years ago

Search