Practice repo for interview questions about git/github.
git init
git clone
git status
git add .
git commit -m "message"
git remote add origin https://github.com/JoannaSprottHome/git-knowledge.git
git push -u origin master - first push
git push origin <branch-name>
git pull origin master
git checkout <branch-name>
git checkout -b <my-new-branch>
git merge origin/master
git pull
git branch -D <branch-to-delete>
git log -1
git checkout <previous-commit>
git revert <previous-commit>
git revert --abort
If you are on a detached head, create a new branch and you will see your changes when you push.
git revert HEAD ~1 - only works on local changes, not after branch has been pushed.
git stash
git stash -u include new files just added (untracked)
git stash --all - include file on gitignore
git stash pop
git stash list
git stash show
git stash pop stash@{2} - choose which stash to apply
git stash clear - get rid of them all
git checkout -f <branch_name> switch to another branch by losing all the local changes.
git branch -m <new-branch-name>
| fetch | pull |
|---|---|
| Only downloads new data from a remote repository | Updates the current HEAD branch with the latest changes from the remote server |
| Does not integrate any new data into your working files. | Downloads new data and integrate it with the current working files |
| Users can run a Git fetch at any time to update the remote-tracking branches | Tries to merge remote changes with your local ones |
git fetch origin, git fetch –-all (origin is only one of the remotes) |
git pull origin master |
1. In Git how do you revert a commit that has already been pushed and made public?
https://stackoverflow.com/questions/22682870/git-undo-pushed-commits
2. How do you squash last N commits into a single commit?
3. What is Git bisect? How can you use it to determine the source of a (regression) bug? ✔️
Run git bisect start, check out a previous commit that you know if correct and run git bisect good. Then checkout out a broken one and run git bisect bad. git will then select a commit in the middle and you mark it good/bad. Keep doing this until you find the commit with the problem.
4. What is Git rebase and how can it be used to resolve conflicts in a feature branch before merge?
Rebase is a way to combine commits so that they are stacked sequentially in the history.
Ensure you are on the master branch:-
git checkout master
Pull the latest from the remote:-
git pull
Checkout the feature branch:-
git checkout my-feature-branch
Update your copy in the repo:-
git push origin my-feature-branch
Rebase on the master branch:-
git rebase master
Force update the remote:-
git push origin my-feature-branch --force
5. How do you configure a Git repository to run code sanity checking tools right before making commits, and preventing them if the test fails?
6. How do you find a list of files that has changed in a particular commit?
7. How do you setup a script to run every time a repository receives new commits through push?
8. How will you know in Git if a branch has already been merged into master? ✔️
git branch --no-merged master
9. How is a bare repository different from the standard way of initializing a Git repository?
10. Explain the difference between git fetch and git pull. ✔️
git pull = git fetch + git merge
Fetch updates the local copy of the remote.
11. Demonstrate example of git stash. ✔️
12. What is the difference between Git Merge and Git Rebase? ✔️
Rebase makes the history a straight line so it's cleaner (useful if you have lots of merging and it looks mesy, but it's hard to unpick commits).
- Feature branching A feature branch model keeps all of the changes for a particular feature inside of a branch. When the feature is fully tested and validated by automated tests, the branch is then merged into master.
- Task branching In this model each task is implemented on its own branch with the task key included in the branch name. It is easy to see which code implements which task, just look for the task key in the branch name.
- Release branching Once the develop branch has acquired enough features for a release, you can clone that branch to form a Release branch. Creating this branch starts the next release cycle, so no new features can be added after this point, only bug fixes, documentation generation, and other release-oriented tasks should go in this branch. Once it is ready to ship, the release gets merged into master and tagged with a version number. In addition, it should be merged back into develop branch, which may have progressed since the release was initiated.
- Trunk-based vs branch-based Using Optimizely for feature flags
- Set up git tree to view changes ✔️
- Explore github UI a bit more
- Set up a bot for github using probot after trying out some existing ones. ✔️
- Create a new project with github actions set up
- Finish github profile with udacity videos
- Research
git switch
- https://www.edureka.co/blog/interview-questions/top-devops-interview-questions-2016/
- https://www.simplilearn.com/tutorials/devops-tutorial/devops-interview-questions
- https://www.edureka.co/blog/interview-questions/git-interview-questions/
- https://www.softwaretestinghelp.com/git-interview-questions/
- https://hackernoon.com/git-commands-that-every-developer-must-know-qs1n3yex