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

Form validation benchmark added #6

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Form validation benchmark added #6

merged 2 commits into from
Jun 1, 2022

Conversation

deepakdinesh1123
Copy link
Contributor

No description provided.

@deepakdinesh1123 deepakdinesh1123 changed the title Form validate bench Form validation benchmark added May 15, 2022
@smithdc1
Copy link
Member

Could you rebase onto main? This diff is larger than I'm expecting and think a rebase will resolve it.

Let me know if you need any help with this.

@deepakdinesh1123
Copy link
Contributor Author

I reabsed the branch onto main and then committed the changes after that git gave me a message saying that there were changes in origin and I had to do a git pull before committing the changes, I did a git pull after which I pushed the commits, can you please tell me what I should have done?

@smithdc1
Copy link
Member

Well, I'll have a go 👍

I assume that you have your fork as origin,

  1. Add this repo as upstream. git remote add upstream https://github.com/smithdc1/django-asv

You can verify it is added correctly with git remote -v

  1. Fetch git fetch upstream

  2. Rebase git rebase upstream/main

  3. At this point you'll need to resolve the merge conflicts.

  4. Continue the rebase git rebase --continue

  5. Once this is complete your remote branch won't be inline with your local one. So when you push you'll get an error (maybe this is where you got to). You'll need to force to overwrite the remote. git push --force.

Hopefully that's it! 🤞

@smithdc1
Copy link
Member

smithdc1 commented Jun 1, 2022

Thanks @deepakdinesh1123 👍

Tests are working nicely too!

@smithdc1 smithdc1 merged commit da1f18a into django:main Jun 1, 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.

2 participants