Hi @anasustic, could you give more context to this change? Please answer the questions in the contributing guide, in the Submit a pull request section.

Thanks for reminding me of the contribution guide @jflory7. Please take a look when you have a moment if the description gives more context.

@anasustic Thanks for the edit. This change makes sense. :thumbsup:

The pull request also includes extra commits and changes not included in #157. Before merging, the PR should be a single commit that only changes what the commit message describes.

It looks like your branch fell behind from upstream while you were working on changes. My preferred way to get a local branch up-to-date with an upstream branch is with rebasing. This way, you can replay your changes/commits on top of newer commits in the upstream branch. For example, I use the following commands:

# One-time setup to add an upstream remote
git remote add upstream https://pagure.io/fedora-commops/fedora-happiness-packets.git
git checkout master
git pull upstream master
git checkout django-admin
git rebase master

This gets your local master branch in sync with upstream's master branch. Then you can rebase the changes in your django-admin branch onto new changes from the master branch. Does this make sense?

Here are some extra resources on rebasing:

• Don't Be Scared of git rebase
• How to Rebase a Pull Request

For this PR, you may want to start with a fresh branch, make your changes again and commit, and push, if it takes too long to simplify the commits in this PR. The tips above should help for future changes you make. :smiley:

Hi, It does make perfect sense and thanks a lot for all your tips. I will start with a fresh branch for this PR as you suggested.

Hi, I cloned my fork of the project from scratch, pulled the upstream/master and created a new branch and my change (admin.py) is again buried in between all other changes when I want to create a PR from the new branch.
I ran rebase master and pushed it to the origin/branch using the -f switch. It says that my branch is 16 commits ahead of the upstream project master branch. My understanding is that after the rebase it should in effect be only 1 commit away containing 1 file (admin.py).
Any suggestions?

@anasustic Maybe the best thing is to start fresh and commit your changes again. You can save a copy of files you changed first. Then check out a fresh branch from master. Then you can add your changed files in and commit again.

I'm sorry this is being so much trouble. :weary: Thanks for your patience.

Hi @jflory7, I am sorry but I created a new PR #202 Add django admin.py and register models from a fresh branch. I really hope I am in synch with the upstream this time :smile: I used the same name and description for the PR.