Skip to content

Commit

Permalink
Merge pull request infinum#90 from MirelaZ/patch-49
Browse files Browse the repository at this point in the history
Lektura
  • Loading branch information
cilim committed Mar 21, 2019
2 parents 06248f2 + ac51add commit d95b7c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Git Process.md → Git process.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Feature branches are **always** branched out of `master`. They are also merged f

**Never branch out of the `staging` branch and never merge `staging` into `master`**

We use pull requests to add new features—pull requests initiate discussion about your commits. As they're tightly integrated with the underlying Git repository, everyone can see exactly what changes would be merged if they accept your request. When making a pull request, **always** make one for `staging` and one for `master`. The pull request workflow is defined separately for each project.
We use pull requests to add new features—pull requests initiate discussion about your commits. As they're tightly integrated with the underlying Git repository, everyone can see exactly what changes will be merged if they accept your request. When making a pull request, **always** make one for `staging` and one for `master`. The pull request workflow is defined separately for each project.

### Why do you need the `staging` branch and why you should never merge it into `master`

Expand Down

0 comments on commit d95b7c5

Please sign in to comment.