[GSoC'2025 Amharic Chapter] - update Mapping_am.xml, mappingstats_am.txt & ignorelist_am.txt#781
[GSoC'2025 Amharic Chapter] - update Mapping_am.xml, mappingstats_am.txt & ignorelist_am.txt#781contact-andy wants to merge 3 commits intodbpedia:masterfrom
Conversation
bee2f92 to
3d74e4d
Compare
|
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
WalkthroughThe change updates two Amharic statistics files: a large expansion of ignore list entries for templates (including unresolved merge conflict markers) and a minor whitespace adjustment in the mapping stats file. No code or control-flow modifications are introduced. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
server/src/main/statistics/ignorelist_am.txt(1 hunks)server/src/main/statistics/mappingstats_am.txt(1 hunks)
| <<<<<<< HEAD | ||
| properties|0 | ||
|
|
||
| ======= | ||
| properties|8 | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ኤ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ቢ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ሲ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ዲ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ኢ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ኤፍ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ጂ | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
|
|
||
| template|የ2010 እ.ኤ.አ. ፊፋ የዓለም ዋንጫ ምድብ ኤች | ||
| properties|4 | ||
| የተስፋፋ | ||
| ግጥሚያዎች | ||
| scenarios | ||
| tiebreakers | ||
| >>>>>>> 6f7bcd2b9 ([GSoC'2025 Amharic Chapter] - update ignorelist_am.txt with latest exclusions) |
There was a problem hiding this comment.
Resolve the merge conflict markers before merging.
<<<<<<< HEAD / ======= / >>>>>>> … remain in the file, so the ignore list will not load. Clean up the conflict and keep only the intended entries.
🤖 Prompt for AI Agents
In server/src/main/statistics/ignorelist_am.txt around lines 3 to 64 there are
unresolved Git merge conflict markers (<<<<<<< HEAD / ======= / >>>>>>>) that
will break loading; remove the markers and produce a single clean file
containing only the intended ignore entries (keep the desired block(s) from
either side or merge them intentionally — e.g., retain the full set of
template/properties entries from the incoming change if that is correct), ensure
there are no leftover conflict tokens or duplicate/partial lines, save the file,
and git add/commit the resolved file.



This PR refines Amharic mappings and updates local statistics and ignore list as part of GSoC 2025 contributions.
Summary by CodeRabbit