Friday, Sep 28, 2018
shippedAdmin panel with login and dashboard added to spoonsor
Buğra Gündüz merged an admin panel feature into spoonsor and resolved branch conflicts that had accumulated since switching to a branched development workflow.
The main work was merging the admin panel feature [1], which added a login view, dashboard, and active user count display [4]. That feature landed via pull request to develop, then Gündüz resolved the merge issues that had built up [2] by merging develop back into master [3]. The pull requests had been creating friction since the branched workflow went into effect, so consolidating the branches helped clear the path forward.
Sources
- Feat/admin panel (#3) · bgrgndzz/spoonsor
- Merge develop with master to solve merge issues · bgrgndzz/spoonsor
- Merge develop with master to solve merge issues (#4) · bgrgndzz/spoonsor
- Feat/admin panel (#3) (#5) · bgrgndzz/spoonsor