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 problem with USER_AFTER_REGISTER_ENDPOINT. #178

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

carrete
Copy link

@carrete carrete commented Aug 22, 2017

Per #177, this may or may not be correct nor complete.

@and-semakin
Copy link
Collaborator

and-semakin commented Nov 23, 2019

Hi @carrete! Thank you for your contribution! I am afraid that we can not accept this changes to v0.6 branch as it is not actively developed or maintained. Could you please start your branch from master and specify master as a target of the PR? We have exactly the same code here in user_manager__views.py:498 with the same issues.

@and-semakin and-semakin changed the base branch from v0.6 to master November 23, 2019 19:31
@and-semakin and-semakin changed the base branch from master to v0.6 November 23, 2019 19:33
@and-semakin and-semakin added the Wrong target branch Change target branch in the PR to master label Nov 24, 2019
@carrete
Copy link
Author

carrete commented Nov 27, 2019

Hi @and-semakin , I see in the change history above you retargeted this pull-request for master and then switched it back to v0.6. What, if anything, do you need me to do?

@and-semakin and-semakin changed the base branch from v0.6 to master November 30, 2019 05:45
@and-semakin
Copy link
Collaborator

and-semakin commented Nov 30, 2019

Hi @carrete! Just wanted to try if it will work :)

Source branch (carrete:gh-issue-177) is started from 0.6 so it can not be merged into master without conflicts (file moved):

image

Could you please start your branch from master? I'm afraid that you will have to manually re-apply the same changes to the new file. If everything goes right than what I mean can be accomplished with the following git commands:

# go to your Flask-User fork repository
cd Flask-User

# change branch to master
git checkout master

# update your fork
git remote add upstream https://github.com/lingthio/Flask-User.git
git pull upstream master
git push origin master

# delete old branch
git branch -d gh-issue-177

# create new branch with the same name from master
git checkout -b gh-issue-177

# manually apply the same changes to `user_manager__views.py`
...

# commit changes
git add flask_user/user_manager__views.py
git commit -m "Fix #177"

# push branch to the same PR
git push --set-upstream origin --force gh-issue-177

I apologize for the inconvenience and the fact that this PR has been in review for so long. I can do it myself, but I really appreciate your contribution and want your name to be under this commit :)

Thank you!

@and-semakin and-semakin changed the base branch from master to v0.6 November 30, 2019 06:09
@carrete carrete changed the base branch from v0.6 to master November 30, 2019 17:13
@carrete
Copy link
Author

carrete commented Nov 30, 2019

@and-semakin Thanks for your very detailed instructions. How does it look now?

@and-semakin and-semakin removed the Wrong target branch Change target branch in the PR to master label Nov 30, 2019
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.

2 participants