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

Adds #6

Merged
merged 15 commits into from
Mar 13, 2015
Merged

Adds #6

merged 15 commits into from
Mar 13, 2015

Conversation

esakuda
Copy link
Owner

@esakuda esakuda commented Mar 12, 2015

hice el ultimo rebase de master Lo "nuevo" de este branch es entre el rebase maser ( 7933b73) y el commit de correccioens de rebase (4a317de)

Solo de tres view models: FormViewModel, NewEditorViewModel,
ProfileViewModel
@@ -614,6 +614,7 @@
</view>
<toolbarItems/>
<navigationItem key="navigationItem" title="Creat a new" id="sW7-fD-Mjx">

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Este tipo de cambios no hay que commitearlo.

SIEMPRE antes de commitear hay que revisar que cambios se estan subiendo y descartar todos aquellos que se hayan hecho por equivocacion, o sin intencion.

En este caso dejalo, pero sobre todo los storyboard hay que tocarlos lo menos posible porque son muy propensos a conflictuar.

@pablog
Copy link
Collaborator

pablog commented Mar 12, 2015

👍

@esakuda esakuda merged commit c8ce57c into master Mar 13, 2015
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.

2 participants