Merge conflict
- Refer Here for merge conflicts
rebase
- rebase is the only command in git which can change history.
- A git commit is a hash of
- parent commit
- message
- datetime
- author
- changes
- Refer Here for the git rebase
cherry-pick
- Refer Here for cherry-pick
How git is working
- Watch classroom video
Git has two logs
- the log which we use to understand the graph (DAG)
- reflog: This is kind of permanent log in local git repo which maintains the list of all activities done by you.
- usages of reflog To be discussed later
Altering history
- Ammend commits:
- command
git commit --amend - This can change the commit message and add more changes from staging area to this commit where HEAD is pointed to
- command
