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

Fix #181 #182

Merged
merged 3 commits into from
Oct 7, 2024
Merged

Fix #181 #182

merged 3 commits into from
Oct 7, 2024

Conversation

thw26
Copy link
Collaborator

@thw26 thw26 commented Sep 28, 2024

Fix #181

The second commit should help prepare for #168.

@thw26
Copy link
Collaborator Author

thw26 commented Oct 7, 2024

We need to clear the recently added TODO.

@n8marti
Copy link
Collaborator

n8marti commented Oct 7, 2024

Here's the conflict I see if I start a merge locally:

<<<<<<< HEAD
def cli_acknowledge_question(question_text, no_text, secondary):
    if not cli_question(question_text, secondary):
        logos_msg(no_text)
=======
def cli_acknowledge_question(QUESTION_TEXT, NO_TEXT):
    if not cli_question(QUESTION_TEXT, ""):
        logos_msg(NO_TEXT)
>>>>>>> 181-regression
        return False
    else:
        return True

What's the correct fix? It looks like it's only used once:

$ grep -n cli_acknowledge_question *.py
msg.py:229:def cli_acknowledge_question(question_text, no_text, secondary):
msg.py:271:        return cli_acknowledge_question(question_text, no_text, secondary)

Can we just keep what's already main and drop what was changed in 181-regression?

@thw26 thw26 merged commit 3598227 into main Oct 7, 2024
@n8marti n8marti deleted the 181-regression branch October 9, 2024 04:19
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.

cli_question missing 1 required positional argument: 'secondary'
2 participants