Pull Request(PR) steps [EN] - LmeSzinc/AzurLaneAutoScript GitHub Wiki
Github Pull Request steps
-
If you forked a long time ago, first go to the bottom of
Settings
in your repository and delete it. -
Open Alas main repository, click
Fork
in the upper right corner, then clickCreate fork
in green below -
Go to your own Alas repository and
clone
thedev
branch to localgit clone url -b dev
-
Read the Alas development documentation
-
Here's your chance to become an honorable Alas contributor!
-
During development, it is recommended to submit
commit
after completing all functions/tasks, and don't forget to writemessage
in the followinguniform format
git commit -m 'message'
Example of uniform format for message.
Upd: [EN] RESEARCH_UNAVAILABLE Add: Handle the 6th research project Fix: Continuous click in research_queue_add() on slow PCs
-
Push the local branch to your own repository after you finish development
git push -u origin
For the first time the
push
needs to set the upload stream (--set-upstream
) follow the tips, then continue with step 7 -
Open the Alas repository. Submit a
pull request
(which will automatically carry yourcommit
message) and wait for the administrator to approve it. Note: Commit to thedev
branch, not to themaster
branch! -
When there are changes to the original Alas repository (made by someone else), you need to fetch and merge changes to your onw repository first
-
Add upstream of the original Alas repository
git remote add upstream https://github.com/LmeSzinc/AzurLaneAutoScript.git
-
Fetch updates from the original Alas repository
git fetch upstream
-
Merge the changes
git merge upstream/dev
-
Handle branch conflicts
-
Repeat the actions in steps 5, 6, 7, and 8
-