3
edits
Nonbinary Wiki:General discussion/Archive 1: Difference between revisions
Nonbinary Wiki:General discussion/Archive 1 (edit)
Revision as of 00:03, 5 August 2017
, 6 years ago→Merge conflicts: new section
No edit summary |
(→Merge conflicts: new section) |
||
| Line 152: | Line 152: | ||
: That's weird. It didn't do that on my test wiki. Sorry. I will look and figure out how best to do that. If you look through my contributions, and find things that don't say "Created page", that should be most of them. I will go through and revert them now because yours are more current. [[User:Falkirks|Falkirks]] ([[User talk:Falkirks|talk]]) 16:17, 4 August 2017 (UTC) | : That's weird. It didn't do that on my test wiki. Sorry. I will look and figure out how best to do that. If you look through my contributions, and find things that don't say "Created page", that should be most of them. I will go through and revert them now because yours are more current. [[User:Falkirks|Falkirks]] ([[User talk:Falkirks|talk]]) 16:17, 4 August 2017 (UTC) | ||
:: I am reverting most of them, I will post a new discussion here about ones I have left. [[User:Falkirks|Falkirks]] ([[User talk:Falkirks|talk]]) 16:24, 4 August 2017 (UTC) | :: I am reverting most of them, I will post a new discussion here about ones I have left. [[User:Falkirks|Falkirks]] ([[User talk:Falkirks|talk]]) 16:24, 4 August 2017 (UTC) | ||
== Merge conflicts == | |||
I have gone through quite a few pages to revert changes made by the merge. There are a few pages which I have left be for now (because the merged version is more complete). There are also some naming conflicts which need resolved in some way. | |||
=== Pages overwritten === | |||
* [[Xenogender]] | |||
* [[Transsexual]] | |||
* [[Two-spirit]] | |||
* [[Transgender]] | |||
* [[LGBT]] | |||
* [[Gender neutral language]] | |||
* [[Binary genders]] | |||
* [[Umbrella term]] | |||
* [[Sex]] | |||
* [[Pronouns]] | |||
* [[Nonbinary gender]] | |||
* [[Neutrois]] | |||
* [[Bigender]] | |||
* [[Androgyne]] | |||
* [[Gender expression]] | |||
... There may be others which I haven't gotten to yet, but those are unintentional. | |||
=== Naming conflicts === | |||
* In the imported content [[Gender-variant identities worldwide]] is used, but here [[Nonbinary identities worldwide]] is used. Leaving two similar pages. | |||
* In the imported content [[Assigned gender at birth]] is use, but here [[Assigned gender]] is used. Leaving two similar pages. | |||
* In the imported content [[Demiboy]] and [[Demigirl]] were both redirects to [[Demigender]] which contained information about all demigenders. Now there is duplicated content. | |||
If anyone finds additional issues, feel free to update this list. | |||
[[User:Falkirks|Falkirks]] ([[User talk:Falkirks|talk]]) 00:03, 5 August 2017 (UTC) | |||