Template:Merging: Difference between revisions

← Older edit

Template:Merging (view source)

Revision as of 04:15, June 13, 2021

466 bytes added , 3 years ago

Although this template is obsolete, it is still used on many pages, so it can't be deleted. (Plus, it's an important part of Pikipedia history.)

Soprano

Administrators

10,829

edits

@@ Line 1: / Line 1: @@
-{{box|This page is part of the merge with Pikmin Wiki, and needs resolving.
+{{box|''This page is part of the [[User:Espyo/Pikmin Wiki welcome|merge]] with Pikmin Wiki, and needs resolving. Please bear with us as we do so.''
-{{#ifeq:{{{1}}}|conflict|The Pikmin Wiki version of the page can be found at [[{{FULLPAGENAME}}/merge]], and needs to be manually merged into this page.|This page has no Pikipedia version, so it just needs to be cleaned up to use appropriate templates and categories.}}{{#ifeq:{{{2}}}|{{FULLPAGENAME}}||<br/>
+{{#ifeq:{{{1}}}|conflict|''Before the import, this subject had a page both on Pikipedia and Pikmin Wiki. You are currently reading the Pikipedia version, and the Pikmin Wiki version can be found '''[[{{FULLPAGENAME}}/merge|here]]'''. Both versions need to be manually merged together and placed on the current page.''<includeonly>[[Category:Merging page conflicts]]</includeonly>|''This subject had no page on Pikipedia before the import, so in order to merge it, it just needs to be cleaned up.''<includeonly>[[Category:Merging new pages]]</includeonly>}}{{#ifeq:{{{2}}}|{{FULLPAGENAME}}||<br>
-At Pikmin Wiki, this page was called ''{{{2}}}''; if this is different from the current title, it might make sense to rename this page.}} }}<includeonly>[[Category: merging pages]]</includeonly>
+''At Pikmin Wiki, this page was called "{{{2}}}", which is likely different from the current title. It might make sense to rename this page.''}} |4=max-width: 60%;}}<includeonly>[[Category:Merging pages]]</includeonly><noinclude>[[Category:Box templates]]
+[[Category:Maintenance templates]]</noinclude>