GitFlow - spinningideas/resources GitHub Wiki
Below are various resources related to gitflow
Learning
High Level Approaches
- https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
- https://support.gitkraken.com/git-workflows-and-extensions/git-flow/
- https://leanpub.com/git-flow/read
- https://dev.to/heratpatel/git-flow-a-successful-git-branching-model-1j6f
Approach Utilizing Master, Dev/Sprint, Features, and Release Branching
Feature Branches
Steps
- Pull down the remote repository using git clone command where <github_repo_url> is your project repository on github (eg https://github.com/YOUR-REPOSITORY). See steps: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository. Note that you probably only need to clone the branch you are using as starting point (eg development branch)
git clone -branch **development** https://github.com//YOUR-REPOSITORY
- Create feature branch from development or master branch depending on agreed upon flow
git checkout -b "feature/your-feature"
- After finish feature push feature branch to remote
git push origin feature/your-feature
-
Create pull request (PR) on github which will enable review and merge to development branch. See steps here: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
-
After your feature branch is merged to develop branch then you can delete feature branches on remote repository and local repository once you are sure you no longer need it.
git push origin feature/your-feature --delete // delete remote branch
git branch -D feature/your-feature // delete local branch