Skip to content

Cheat Guide for VCS

David Gonzalez edited this page Jun 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

get up to speed with another branch

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

saving your changes into a new branch

if you decide not to mess with a current branch but want to keep the changes you have done so far

git checkout -b your_new_branch

###saving your credentials locally

git config credential.helper store
git push your_repository_url

for ours "your_repository_url" is https://github.com/tlatoza/SeeCodeRun.git #References 1. GitHub Workflow

Clone this wiki locally