learn GIT
day# 8
[REFERENCE]
- ] # 2568 - overview git in technology-software/developer/source-code-managment
- ] # 4076 - overview git in project-035/planning/documentation
- ] # 4522 - create FAQ - about git - not really a FAq, more of a PAQ - Personally Asked
- ] # ### - ignore this
[previously]
- [2014-03-15] day# 1 - Git Started
- ] download and install git, ] configure git, ] create an ART overview git ]
- [2014-03-16] day# 2 - REVIEW VIDEO tutorial
- ] review tutorial, ] start MY prj-001, ] a few questions, ] abondoned lrn-git project ???
- [2014-12-07] day# 3 - RETURN to git, addED SCENARIO'S
- x] COMPLETE interactive tutorial on github to practice using git Bash CLI and learn me some git commands
- x] layed out some different use case scenario's for how 1 might be using git, see below ...
- [2014-12-07] SCENE 1 - you are CREATE a new local project
- [2014-12-07] SCENE 2 - you HAVE an existing local project
- [2014-12-07] SCENE 3 - you HAVE/WANT to work on an existing remote project, (clone to local, make changes, push to remote)
- [2014-12-07] SCENE 4 - GET(clone) an existing remote project for inclusion into ...
- [2014-12-08] day# 4 - create repo, add remote repo, push repo to remote,
- +] SCENARIO - ADDing some component into your project
- x] forwarded in /NEXT items from previous days (1-3)
- [2014-12-08] day# 5 - create a branch, switch between branches, delete a branch
- x] what is a branch, creating a branch, making changes to your code within the branch, switching back to a different branch and
- [2014-12-14] day # 6 - merge, pull,
- ] merge is when you combine branches into the master branch,
- [2014-12-15] day # 7 - tagging and loggin
- ] tag your commits, use
[currently]
- [2014-12-09] SCENE 1 - CREATE a new local project(contd) - replace(undo) local changes
- ] undo local changes
- ] SUMMARY
- ]
- ]
[next]
- [2014-12-dd] day# 10
- ] # # -
- [2014-12-08] NEW
- ] now what - we have our local repo, we have pushed our local repo to a remote server, anyone can clone it
- ] changes - edit file, git add, git commit,
- ]
] git replace local changes
In case you did something wrong (which for sure never happens ;) you can replace local changes using the command
git checkout -- <filename>
this replaces the changes in your working tree with the last content in HEAD. Changes already added to the index, as well as new files, will be kept.
If you instead want to drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it like this
git fetch origin
git reset --hard origin/master