Skip to content

fix: merge conflict issue #995

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.

Sign up for GitHub

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

Merged
lwasser merged 1 commit into from
Nov 3, 2026
Merged

fix: merge conflict issue #995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions content/blog/2026-12-08-when-the-human-disappears-europython.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,8 @@ it. That makes the community less open, honest, and secure.
The maintainers in our group prefer flexible guidelines to strict rules and
policies. Approaches include:

<<<<<<< HEAD
* Open an issue before opening a pull request, so a human conversation happens before any contribution. As a human, connect first with other humans.
=======
* Open an issue before opening a pull request, so a human conversation
happens before any contribution. Connect first with other humans.
>>>>>>> faea5734 (docs(blog): copy edits from Erika)
* Disclose AI use, including when the output hasn't been fully reviewed.
* Hold quality constant. The standard is the same whether or not a tool was
used. If an AI-assisted contribution is high quality, maintainers accept it.
Expand Down
Loading