-
Notifications
You must be signed in to change notification settings - Fork 17
Contribution guide
clone QA catalogue at https://github.com/pkiraly/qa-catalogue.git then
git clone https://github.com/YOUR_NAME/qa-catalogue.git qa-catalogue
cd qa-catalogue
create a new branch locally for the pull request (the name should reflect the ticket ID and title)
git checkout -b 123-COOL-FEATURE
working on the branch ... then commit changes
git commit -am "issue #123: explanation of changes"
upload the new branch to https://github.com/YOUR_NAME/qa-catalogue
git push -u origin 123-COOL-FEATURE
... then create pull request at github.com/YOUR_NAME/qa-catalogue
register the main QA catalogue repo
git remote add upstream https://github.com/pkiraly/qa-catalogue.git
git checkout main
update local develop branch from https://github.com/pkiraly/qa-catalogue
git fetch upstream main
git rebase upstream/main
update remote develop branch at https://github.com/YOUR_NAME/qa-catalogue
git push
create a new branch locally for the pull request
git checkout -b 123-COOL-FEATURE
work on the branch and commit changes
git commit -am "#123 explanation of changes"
upload the new branch to https://github.com/YOUR_NAME/qa-catalogue
git push -u origin 123-COOL-FEATURE
... then create pull request at github.com/YOUR_NAME/qa-catalogue
git checkout main
update local develop branch from https://github.com/pkiraly/qa-catalogue
git fetch upstream main
git rebase upstream/main
update remote develop branch at https://github.com/YOUR_NAME/qa-catalogue
git push
change to the already existing feature branch
git checkout 123-COOL-FEATURE
merge changes of develop to the feature branch
git merge main
check if there are conflicts, if there are follow the next command, otherwise skip to next block
- fix the relevant files (including testing)
- commit changes
git add <fixed files>
git commit
update remote feature branch at https://github.com/YOUR_NAME/qa-catalogue
git push