Skip to content
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.

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

Functional home and order screens #56

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

Conversation

aitorarias
Copy link
Collaborator

Before submitting a pull request, please make sure the following is done:

Flow (current branch) action

(master) git pull origin master
(master) git checkout -b X
(X) hacemos los cambios que ibamos a hacer
(X) git add .
(X) git commit -m "He arreglado tal cosa"
(X) git checkout master
(master) git pull origin master
(master) git checkout X
(X) git merge master
(X) git push origin X
Vas a github y abres un pull request
una vez hecho el pull request, vas a master, y borras la rama en la que estabas: git branch -D X
y a continuación: git pull origin master

No hay que pushear la rama sino has acabado con tu tarea.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant