Skip to content

Commit

Permalink
Merge pull request #72 from BW-PA/patch-1
Browse files Browse the repository at this point in the history
Updated MD formatting in BranchingStrategy.md
  • Loading branch information
freddydk authored Mar 25, 2022
2 parents 0d3c945 + 44deca3 commit 7c4e6ff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Scenarios/BranchingStrategy.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
##Branching strategy##
## Branching strategy ##
A version control like Git gives you flexibility in how you share and manage code. **Your team should find a balance between this flexibility and the need to collaborate and share code.**

Adopt a branching strategy for your team that is flexible and yet easy to adopt by your team. You can collaborate better and spend less time managing version control and more time developing code.

###Keep it simple and relevant###
### Keep it simple and relevant ###
Keep your branch strategy simple and relevant to your needs. If your team is small and collaboration is limited, a simpler branching strategy will be a better option. When choosing a branching strategy, pay attention to these three concepts:

- Use feature branches for all new features and bug fixes.
- Merge feature branches into the main branch using pull requests.
- Keep a high quality, up-to-date main branch.
read more here https://docs.microsoft.com/en-us/azure/devops/repos/git/git-branching-guidance?view=azure-devops#keep-a-high-quality-up-to-date-main-branch

###Use a feature branch###
### Use a feature branch ###
A CI/CD workflow runs when a pull request is created. In this case the artifacts should NOT be published from a feature branch (ignore the CD part of the workflow).

CI/CD workflow also runs when a pull request is merged to main branch. Use the artifacts generated in this workflow to create a release. CD part can use the artifact generated in CI, for example to deploy them to a sandbox environment.
Expand Down

0 comments on commit 7c4e6ff

Please sign in to comment.