pushed them to the master branch of my fork
This can makes your next pull request hard to merge. What you should do now is
git checkout master
git pull --rebase upstream master
where upstream
is the "original" repo, to get your master
branch in line with its master
. The rebase
may take manual editing. Now, to submit a pull request, branch off master:
git checkout -b new-branch
# edit edit edit
git push origin new-branch
and submit a pull request from your new branch. This way, your master
branch stays in sync with the original repo's.
If you still have commits in your master
that are not in upstream's master
, make sure you put those in a separate branch, then git reset --hard
the master
branch.