Pull Request Workflow - Aptronics/aptronics GitHub Wiki

To make changes to Aptronics/aptronics, Aptronics/erpenxt or Aptronics/frappe we use a pull request (PR) workflow:

• Work should be done locally, on the developer's machine and not on servers with production data
• The developer should push changes from their local instance to a fork on their GitHub account (EG hpema/erpnext)
• This push can be done to a feature branch or the primary branch (master or aptronics). As the number of contributors grows, pulls from master to master (or aptronics to aptronics)
• A Pull Request can be opened from the github.com.
• Select "Compare Across Forks" to compare the primary branch against your fork
• At this point it will notify you if there are conflicts that need to be resolved, which may require additional commits and potentially merging the primary branch into your feature branch.