Starting from scratch, these are the basic steps:
Fork the Original repo on GitHub
and after clone on your machine:
Enter the folder and see your current branch:
Code:
cd CodeIgniter4
git branch
You will see:
Add the Original CodeIgniter Repository as a remote repository:
Check your remote repos:
You will see:
Update your current branch from the Original branch:
Code:
git pull upstream develop
Output:
Code:
From github.com:bcit-ci/CodeIgniter4
* branch develop -> FETCH_HEAD
* [new branch] develop -> upstream/develop
Already up to date.
Ok. Then you create a new branch to work in:
Code:
git checkout -b new_feature_x
Check the current branch:
Output:
Code:
develop
* new_feature_x
Do your work. Edit, add what you want. Add the modified files to the stage and commit the changes:
Code:
git add system/filex.php system/filey.php
git commit -m "Message of the modifications"
Push to your fork:
Code:
git push origin new_feature_x
A new branch will be created on GitHub. Then will be possible to open a Pull Request:
Ok. If you opened the PR or not, but you stopped on a method and other developer want to help you with. What he can do:
He can add your fork as a remote repo:
Then, he needs to fetch your custom fork:
Code:
git fetch prezire new_feature_x
And create a branch based on your fork:
Code:
git checkout -b prezire_new_feature_x prezire/new_feature_x
Ok. Then he's at the same point as you. Now he can help. He do what he think is necessary and add the files changed to stage, commit and push to his fork:
Code:
git push origin prezire_new_feature_x
Now, on GitHub, he will have the new branch "prezire_new_feature_x". And there he can open a PR to your fork:
Then, if you merge the changes, this automatically go to your PR on the original fork, if you created.
Ask your contributors to do commits with
GPG-signed.
Read more:
Contribution Guidelines