I've merged:
https://fedoraproject.org/wiki/How_to_be_a_successful_contributor and https://fedoraproject.org/wiki/Subprojects to make only one document

x3mboy let's get this clean up in git and squash it down to one commit and eliminate the unneeded duplicate commit.

I suggest this set of steps:

1. Run git remote -v

You are looking for something like the line labeled upstream below:

upstream    ssh://git@pagure.io/Fedora-Council/council-docs.git (fetch)
upstream    ssh://git@pagure.io/Fedora-Council/council-docs.git (push)

This shows that the name upstream is mapped to the upstream repo.

If you don't have this, get it by running

git remote add upstream ssh://git@pagure.io/Fedora-Council/council-docs.git

1. Now fetch the upstream data. git fetch upstream

2. Now let's rebase. Start by going to your PR branch. Then run git rebase -i upstream/master

You'll get an editor with lines like this:

pick d0a24e1 Adding the tmp Ambassador's reps
pick 4bea2b8 Adding collaboration.adoc
pick 9c0c6bd Merging 2 pages about collaboration

Modify it to look like this

d d0a24e1 Adding the tmp Ambassador's reps
pick 4bea2b8 Adding collaboration.adoc
s 9c0c6bd Merging 2 pages about collaboration

You'll need to modify the commit message.

1. Now force push your pr git push -f

At this point ping @mattdm and others for feedback on your text.