4,534
edits
Changes
Jump to navigation
Jump to search
Line 18:
Line 18: + + + + + + + + + + + +
created pull request explanation
=== Editing ===
=== Editing ===
=== Pull request ===
=== Pull request ===
After making your changes and pushing them to your fork on Github, it is time to ask them to move them to the OFF-system. However before you do this, pull the latest official version into your branch and check for conflicts (see further).
For this you have to create a [https://github.com/openfoodfacts/openfoodfacts-server/pulls Pull Request]. The command for this is in your Github-client.
In creating a pull request you have to define a title (prefix with '''chore:''')and a description with why and what you changed.
After submitting your request the system will check the changes you made in order to make sure that they do not break things. If the suggested change does break some things, the team help you to get things resolved. Sometimes a suggested change might imply a change on the (break) testing.
Somebody from the team will have a look at your changes to make sure they are fit for purpose. A team member can make some suggestions or accept the change right away. If a suggestion implies that you have to change something: do the edit in your client, push the changes to your fork and the testing process will restart.
You might encounter the warning that there are conflicts. This happens when someone has changed the file you were working on while you were working on it. The system is then confused as it no longer knows which changes it should use. To prevent this you can pull the latest official version to your Github-client. Then you can resolve it on your side. If you are lost here (very easy), let someone from the team help you.
After you changes have been accepted and the pull request is closed by OFF, throw away the branch on your side. Try to start each new edit-session with a new branch.
[[Category:Taxonomies]]
[[Category:Taxonomies]]
[[Category:Maintenance]]
[[Category:Maintenance]]