Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
doc: add descriptions of CI jobs #12555
Please could you format your commit message according to the Contributing Guidelines?
Maybe something like this?
If you don't have time it can be rewritten by whoever lands this, but if you are going to help out more on the project (as I hope you do), then it saves work if you produce better commit messages. The
Also at the moment your Git author name and email address are set to:
People usually choose to use their full names for commits. To set your name globally you can do:
git config --global user.name "REPLACE ME" git config --global user.email "email@example.com" # Or whichever email address you prefer.
To change the author for a single commit you can do:
git commit --amend --author="REPLACE ME <firstname.lastname@example.org>" git push --force-with-lease
If you don't want to have your name against this commit, that's fine too.
Thanks for the ping, looks like this got lost. Please could you rebase this on
@morrme I recommend doing this:
git fetch --all # Update all your remotes git checkout doc-ci-jobs # Make sure you're on the right branch git reset --hard @~ # drop the last commit (the merge one) git rebase -i @~9 # rebase on HEAD~9 as you made 9 commits
git rebase upstream/master # Rebase on the upstream, should be easier now there's just one commit git status # Shows you the file that has conflicts, in this case COLLABORATOR_GUIDE.md
(Note that I kept the bit marked
git add COLLABORATOR_GUIDE.md git rebase --continue git status # Will show that your branch has diverged from origin/doc-ci-jobs git push --force-with-lease # Overwrite your remote branch with the updated local one
Let me know if that works for you.
EDIT: I recommend trying to work through and understand the git squash and rebase workflow, it's pretty opaque initially, but once you get used to it it makes sense. Let me know if you have any questions.
I'm afraid not, it looks like at some point you did a
If you follow what I suggested it should work, you just have to remove the extra commit you added, I'll update that comment (EDIT: updated the instructions)
The problem with that is that the CI will fail if you use the web UI to fix issues, as it rebases onto the latest master (to make sure there aren't any incompatibilities). IMO this is an issue with the