Merge Problem
Bug #616130 reported by
Chris Woollard
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu Manual |
Fix Released
|
High
|
Chris Woollard |
Bug Description
In "The Ubuntu Desktop" there is some <<<< >>>> characters where a merge failed.
So there are two versions of the text.
I need to check and remove one version.
This is a not to myself to fix.
Changed in ubuntu-manual: | |
assignee: | nobody → Chris Woollard (cwoollard) |
Changed in ubuntu-manual: | |
status: | In Progress → Fix Committed |
Changed in ubuntu-manual: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
If you are talking about the "./around- desktop/ around- desktop. tex" file, that was a merge that failed in my pull/commit/push. I cleaned up three different spots where the merge failed. This is a different failed merge, though I don't know if it is in the same or a different spot in the file.
I don't know weather or not this is related to these problems, but in the pull/commit/push that caused my problem, there was a lock on the branch. Normally I would have waited a little while for the lock to be removed, but as the branch had been lock for 64 minutes, so I manually broke the lock.