GPT and other fixes#16
Open
michaelofengend wants to merge 9 commits into
Open
Conversation
Open
ZGainsforth
requested changes
May 29, 2023
Owner
ZGainsforth
left a comment
ZGainsforth
left a comment
There was a problem hiding this comment.
The pull request includes earlier commits which overwrite stuff we just did in PR12. I suspect you didn't pull from head before starting this branch, or you had made this branch a while ago and edited the files in parallel. I suggest making a new branch so it gets the latest version of the project. Then git cherry-pick the commits from this branch you want and resubmit a pull request.
|
|
||
| # import flask relevant packages. | ||
| from flask import Flask, url_for, render_template, redirect, request | ||
| from flask import Flask, url_for, render_template, redirect, request, jsonify, session |
Owner
There was a problem hiding this comment.
This conflicts with the current head. I wonder if you did a git pull before starting this branch? Or maybe you had two branches for the last pull request and this pull request but edited the same lines in the same files in both?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Let me know of any bugs or fixes needed to do.