Things to remember GIT

Question 1

How to create a new Git repository

Answer 1

git init

Question 2

How to inspect the contents of the working directory and staging area?

Answer 2

git status / gst

Question 3

How to add files from the working directory to the staging area?

Answer 3

git add

Question 4

How to show the difference between the working directory and the staging area?

Answer 4

git diff

Question 5

How to permanently store file changes from the staging area in the repository?

Answer 5

git commit -m “message”

Question 6

How to show a list of all previous commits?

Answer 6

git log / git lg

Question 7

How to discard changes in the working directory?

Answer 7

git checkout HEAD filename

Question 8

How to unstages file changes in the staging area?

Answer 8

git reset HEAD filename

Question 9

How to reset to a previous commit in your commit history?

Answer 9

git reset commit_SHA (7-first-digits of the commit)

Question 10

How to add all files at once to the stage?

Answer 10

git add .

Question 11

How to temporarly save/retrieve files in order to switch branches without loosing everything?

Answer 11

git stash

git stash pop

Question 12

How to update your previous commit?

Answer 12

create your changes, stage them with git add and then type the command git
commit –amend

Question 13

How to set up an alias for each command?

Answer 13

git config –global alias.co “checkout” (co becomes checkout)

Question 14

How to move Files in the terminal?

Answer 14

mv file.txt destinared_directory

Question 15

How to rename files in Terminal?

Answer 15

mv file.txt newFile.txt

Question 16

Open VS Code from Terminal?

Answer 16

code .

Question 17

How to delete files from the terminal?

Answer 17

rm file.txt

Question 18

How do you create a local branch?

Answer 18

With git checkout -b new-branch-name.

myproject git:(master) git checkout -b new-branch-name
myproject git:(new-branch-name)
Be careful, always check the branch you currently are on before creating a new branch.

Most of the times you’ll want to be on master with the up-to-date version of master before starting a new feature.
To do so, git checkout master, git pull origin master and THEN create your new branch.

Question 19

How do you resolve a merge conflict with the command line?

Answer 19

On the laptop of the owner of the unmergeable branch:

git checkout master
git pull origin master
git checkout my-unmergeable-branch
git merge master
Then you solve conflicts locally (you can cmd + shift + f ‘»»»’ to find them quickly).

In your terminal:

git add .
git commit -m “conflict solving”
git push origin my-unmergeable-branch
Refresh your PR on GitHub, you can now merge your branch!

Question 20

How do you create a repo on GitHub?

Answer 20

gh repo create –public –source=.

Question 21

How do you print the list of local and remote branches in your terminal?

Answer 21

git branch -a

Question 22

How do you clone an existing GitHub repo on your computer?

Answer 22

fork the repo on github.com

under code copy the SSH adress

git clone ‘ssh-adrress.git’

Question 23

How do you generate your User model using devise?

Answer 23

rails g devise User

Question 24

How to switch to a diffrent hard drive in bash?

Answer 24

cd /D (Capital Letter for the Drive)

Question 25

How to delete a project and it’s files in the terminal?

Answer 25

rm -rf my-project

Question 26

How to merge a branch into main?

Answer 26

git merge branch-name

Question 27

How to delete a branch?

Answer 27

git branch -d branch-name

Question 28

How to list all branches?

Answer 28

git branch

Question 29

How to create a new branch?

Answer 29

git branch branch-name

Question 30

How to switch from one branch to another?

Answer 30

git checkout branch_name

Question 31

How to merge origin/master into your local
branch?

Answer 31

git merge origin/master

Question 32

A common Git collaboration workflow is?

Answer 32

1. Fetch and merge changes from the remote
2. Create a branch to work on a new project feature
3. Develop the feature on a branch and commit the work
4. Fetch and merge from the remote again (in case new commits were made)
5. Push branch up to the remote for review

Steps 1 and 4 are a safeguard against merge conflicts, which occur when two branches contain file changes that cannot be merged with the git merge command.