gistfile1.txt

#upstream
git clone https://github.com/quay/quay-docs.git
cd quay-docs
git remote add thomasmckay git@github.com:thomasmckay/quay-docs.git
               ^--- my "origin"
               
git checkout master
git fetch --all --prune
git merge origin/master

git checkout -b update-readme
<edit README.md>
git status
... shows mod filed ...
git diff
... dhows diff files ...
git commit -a -m "updated README"
git push thomasmckay update-readme
...go to github and create pull-request against master...
get checkout master
git fetch --all --prune
git merge origin/master

...if pull-request needs changes...
git checkout update-readme
... make changes...
git commit -a -m "made fixes"
git rebase origin/master
...resolve conflicts...
git push thomasmckay update-readme
...this will fail with message "fast forward" after a rebase...
git push thomasmckay update-readme --force



git checkout 3.2-release
git fetch --all --prune
git merge origin/3.2-release

git checkout -b 3.2.2-bump-version
...edit files, git commit, etc....
git push thomasmckay 3.2.2-bump-version
...on github make pull-request against 3.2-release...

git checkout 3.2-release
git fetch --all --prune
git merge origin/3.2-release

#cherry-pick changes
git checkout 3.2-release
git checkout -b update-readme-cherrypick
git cherry-pick -x 35d718d3ea750ac08cf146f870813fc68c5ca98c
git commit -a -m "cherry-pick"
git push thomasmckay update-readme-cherrypick
...pull-request, etc....





# downstream
git remote add downstream git@gitlab.cee.redhat.com:red-hat-quay-documentation/quay-documentation.git
git remote add tomckay git@gitlab.cee.redhat.com:tomckay/quay-documentation.git

git checkout 3.2-release
git fetch --all --prune
git merge origin/3.2-release

git push downstream 3.2-release   # this will overwrite whatever is downstream