You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
David Gonzalez edited this page Apr 17, 2016
·
9 revisions
#Working with Git
VCS philosophy
The reason is that changes are broad and staying behind master makes your code more prone to errors
###Get the latest updates to the repository structure
git pull
Know what you have changed
git status
git pull origin branch_you_want_merge
###Resolve conflicts
###Check for current modifications done by you
git status
that one is to see what have you changed in your current workspace