search

Civcraft / NameLayer

Do not open issues here; open them on the maintained fork @ DevotedMC
https://github.com/DevotedMC/NameLayer
BSD 3-Clause "New" or "Revised" License
4 stars 14 forks source link

PlayerType rework the third #232

Closed Maxopoly closed 5 years ago

ProgrammerDan commented 8 years ago

Why didn't you begin your conflict resolution from https://github.com/Civcraft/NameLayer/pull/225/commits/0312de4bd7490f1d5bf8288b5f5be3bc1eb2be7f and https://github.com/Civcraft/NameLayer/pull/225/commits/d80f33fa1457e4acf124626d3e82a2d9a4ffac44 ? Seems kind of odd to waste those efforts, which would have reduced your effort here to again rebase.

Maxopoly commented 8 years ago

Didnt see those, fml

ProgrammerDan commented 8 years ago

from discussion:

#1 if same name, all members from source group get put into the target group's rank of the same name. Source group's permissions on that rank are ignored/discarded.
#2 elsewise, the source group's rank will appear in the target group now
#3 if a member already exists in the source group, their rank will be unchanged.

adding: #4 root/owner groups members from source are added to target group's root/owner group. If that individual was already a member, they are removed from that rank and will appear in root/owner group only.