Skip to content

Commit

Permalink
Add notes on working against a maintenance branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rockfordlhotka committed Apr 4, 2019
1 parent b865580 commit e8c0d65
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions docs/csla-github-flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ Here's a tl;dr summary if you just want to get working without all the backgroun
1. `git checkout -b 123-feature-branch marimer/master`
1. Your local workspace is now in a feature branch based on the latest code in MarimerLLC/csla master

## Create a branch to do some work _against a maintenance branch_
1. Make sure your local clone is updated with MarimerLLC/csla
1. `git fetch marimer`
1. Create a feature branch (work area) based on the upstream master
1. `git checkout -b 123-feature-branch marimer/<maintenance-branch-name>`
1. Your local workspace is now in a feature branch based on the latest code in the maintenance branch
1. **Important:** when you submit your PR (later in this doc) make sure the target of your PR is _<maintenance-branch-name>_, not master

## Do your work
1. Edit code, and do other stuff
1. Commit your changes to your local clone
Expand Down

0 comments on commit e8c0d65

Please sign in to comment.