Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge fork back into original repo #337

Closed
wants to merge 84 commits into from
Closed

Merge fork back into original repo #337

wants to merge 84 commits into from

Conversation

abigailwillow
Copy link
Contributor

@abigailwillow abigailwillow commented Apr 26, 2022

As requested, this PR merges my fork with the main repository. Includes #164, #166, #223, #224, #227, and #246

@SethFalco
Copy link
Contributor

SethFalco commented Apr 29, 2022

You probably won't want to merge directly for this one.

For example:

  • The funding.yml likely shouldn't be replaced. (Or at least not as-is.)
  • The license likely shouldn't be added as-is. However, I do think @abbydiode has made significant enough contributions that their name belongs on the license as well.
  • This repo is Undiscord, not Undiscord+/UndiscordPlus. (README.md and other docs.)

Various little things like that.

TL;DR regarding licensing:
Contributors own all code they submit, technically all names should be written in the license. For example, when I submit code to you, I retain ownership to it, but have just licensed it to you under the same license of your project. (In order for you to distribute it in your project.)

Since attributing all contributors by name isn't feasible for large projects, often the license will just say "and Contributors" at the end to clarify it's also licensed by any small-time contributors too.

However, when someone owns and has licensed to you a significant portion of a particular file or project, it can make sense to name them directly in the license, i.e. something like:

Copyright (c) 2019-2022 Victornpb, Abigail de Joode, and Contributors

or

Copyright (c) 2019-2022 Victornpb and Contributors
Copyright (c) 2022 Abigail de Joode

@victornpb
Copy link
Owner

@SethFalco

You probably won't want to merge directly for this one.

Thank you for the advice!

@victornpb victornpb closed this May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants