Feeling Lucky
?
[#16545] - [4.0] Fixing unresolved merge conflicts
- Fixed in Code Base
- 6 Jun 2017
- Medium
- Build: 4.0-dev
- # 16545
- Diff
- Bakual:FixingMergeConflict
- Success hound No violations found. Woof! Details
User tests: Successful: Unsuccessful:
There are currently two unresolved merge conflicts in the 4.0-dev branch
Summary of Changes
Resolves the conflicts
Testing Instructions
- Create a new menu item. You will get warnings about syntax erros in the XML
- Look at a template (not the style) in the template manager. You get a duplicated text with some <<<< HEAD stuff
Expected result
No unresolved stuff
Actual result
unresolved stuff
Documentation Changes Required
None
@wilsonge Can be merged by review. Just control that I resolved the conflicts correctly.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Administration com_templates Front End com_users |
franz-wohlkoenig
- comment
- 6 Jun 2017
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/16545.
franz-wohlkoenig
- comment
- 6 Jun 2017
RTC after two successful tests.
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2017-06-06 12:15:54 |
| Closed_By | ⇒ | wilsonge | |
| Labels |
Added:
?
|
||
wilsonge
- comment
- 6 Jun 2017
Thanks!
I have tested this item✅ successfully on 8c2a716
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/16545.