|
u
Repository merge failed |
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 |
|
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 rebase failed |
Failed to merge in the changes. (1)10 years ago |
|
emmapeel
Repository rebase failed |
Failed to merge in the changes. (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
|
|
None
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 10 years ago |