Hi @augenauf, thanks for making this contribution! However, the last Pull Request to merge, #25, caused a merge conflict with your Pull Request.

Have you ever solved a git merge conflict before? You will need to rebase your prereq branch onto the latest origin/master branch. @bcotton's git guide may be a useful reference.

This is the string of commands I usually run in the terminal on my local cloned fork:

cd /path/to/git
# Do this if you do not yet have an upstream remote
git remote add upstream https://pagure.io/fedora-docs/documentation-contributors-guide.git
git checkout master
git pull upstream master
git checkout prereq
git rebase master
# Here, you will be prompted to solve the merge conflict by the git client.
# You will need to edit the file and fix the conflicts in your text editor.
git add modules/contributing/pages/prerequisites.adoc
git rebase --continue
# I can't remember if you need to commit again
git commit -asm "Fix merge conflict (or write your own message here)"
git push origin prereq

I typed this out in long-form to give you an idea of the workflow. Let us know if you have any questions or need other pointers.

Thanks for the explanation. Unfortunately, I am lacking the knowledge to follow the implications of each command. I decided to cancel the pull request. Meanwhile, my way of re-basing is to delete the local clone and re-clone.

If I find the time, I may submit a new PR, but for now, there is way too much overhead compared to the outcome.

Thanks for being honest. If you open a new PR, would be happy to review and get it merged.

+1

@augenauf I'd suggest reading the Pro Git book if you have the time. There's a section specifically on rebasing (3.6), but in order to better understand it I'd suggest going through the entire chapter 3 at least: https://git-scm.com/book/en/v2

There's also a number of interactive tutorials available - search for "interactive git tutorial" and you'll definitely find something.