Skip to content

fix(git): branches and pull-request #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(git): branches and pull-request #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c1db4
fix(git): branches and pull-request
bunzli Mar 25, 2019
f001ea2
fixup! fix(git): branches and pull-request
bunzli Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools/git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ Nota: Esto es un extracto/traducción de [este documento](https://github.com/ang

### Branches y Pull-requests

Salvo cosas muy insignificantes, los features los hacemos en un nuevo branch y hacemos un pull-request hacia master.
El flujo normal de desarrollo es crear un nuevo branch y luego hacer un PR a master.

A veces, si el feature es muy grande, conviene tener un feature branch, y primero hacer PRs a ese branch antes del gran PR a master.