Closed negentropicdev closed 6 months ago
I'm in the process of revamping the dev setup and workflow pages. This week I'll be going through the web server setup from scratch in a fresh vm and screen recording the whole process to have video instructions on youtube as well as screenshots for the wiki instructions.
The atlassian wiki for the Forking workflow has more details on our development working model, these should be reflected in the wiki which only discuses gitflow but misses on some details about working with multiple remote repositories.
https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow
Namely one of the points that should be added is adding a secondary remote to a developer's local clone of their own fork that points back to the official repo and is typically named upstream. This provides the mechanism to pull in updates from the official develop branch that may have taken place after they started developing their new feature and would be required for their PR to succeed.