|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/faq.es.po CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po 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/install/mac.es.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/faq.es.po CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po 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/install/mac.es.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/faq.es.po CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po 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/install/mac.es.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/faq.es.po CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po 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/install/mac.es.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/support/faq.es.po CONFLICT (content): Merge conflict in wiki/src/support/faq.es.po 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/install/mac.es.po CONFLICT (content): Merge conflict in wiki/src/install/mac.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/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/about/contact.pt.po CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
None
Changes pushed |
Changes pushed
03/19/2018
|
|
cacu
Changes pushed |
Changes pushed
03/19/2018
|
|
cacu
Changes pushed |
Changes pushed
03/19/2018
|
|
cacu
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/19/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 03/19/2018 |
|
emmapeel
Repository merge failed |
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.6.1.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po Auto-merging wiki/src/news/version_3.6.1.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fr.po Auto-merging wiki/src/news/version_3.6.1.es.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.es.po Auto-merging wiki/src/news/version_3.6.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)03/19/2018 |
|
emmapeel
Changes pushed |
Changes pushed
03/19/2018
|
|
emmapeel
Repository rebase failed |
error: Failed to merge in the changes. (128)03/19/2018 |