Getting started with git:

Installing Git:

First one we going to install Git.
This link may be hellp us. Visit https://git-scm.com/downloads
After installation we are going to follow These commands

Running our first Git command:

First we are going to create an account, then git know that who operate me.

1. git config --global user.name "Salman"
2. git config --global user.email “Salman@gmail.com”

Second we create a empty Folder and open it.
Then press the right click button and select Git Bash Here in your empty folder.
You see that one windows file open in pc screen, it's look like a cmmand prompt.
So we are ready to use Git(version control system).
First we write a command.

 - Git init

Second we create a file useing git commands

- echo "your contant" >> file.txt

Know we are going to Add a file who untrack.

1. git add file.txt
2. git add -A
3. git add .
4. git --All

So we are going to make a file to the part of repository.

1. git commit -m "First commit"
2. git commit

Viewing the history:

If we write and use this command, it's tell you files are untrack or modified.

1. git status
2. git log

The staging area:

The staging area or index is a virtual place that collects all the files you want to include in the next commit.

Unstaging a file:

Be sure to be in a clean state by typing git status.
Create a new file touch NewFile.txt.
Using git status again, verify that NewFile.txt is untracked.
Use the git add NewFile.txt command and go on.
Use the suggested git reset HEAD <file name> or git rm --cached command to back the file in the untracked status.

Ignoring some files and folders:

We can create a .gitignore file in the repository. Git will read it and then skip the files and folders we listed inside it.

First we need a working repository.
second we need a file .gitignore so write a command to create a file 2nd option to manualy create a gitignore file through a right click option.
Put text inside it like.

# this is a simple of .gitignore file
  just write any file which you like to ignore it.
  *.tmp

Save the file.
Add the file to the index.
commit the gitignore file.
create a temp file file.tmp with a simple touch command.
Try to add all of the files in your working directory to the index and verify that Git will not add anything.

To add a file in the .gitconfig file even if it is marked to be
ignored, you can use the `git add -f (--force)` option.

Highlighting an important commit-Git tags:

git tag -a Mytagname -m "This is my first tag"

Tags will become useful in the future to keep track of important things such as a newsoftware release.

Branch:

A branch is essentially another way your repository takes.While programming, you will use branches to experiment with changes.
Let's start using the git branch command alone. If you do this, you will get a list of the branches included in the current repository git branch.

Creating a new branch:

   Now, let's start creating a new branch for a new activity.
   `git branch newuser`.

Switching from branch to branch:

   separate argument. To move around from one branch to another,
   we will use the `git checkout <branch name>` command.

Merging branches:

To merge two branches, we have to move to the branch that contains the other branch commits. So, if we want to merge the NewWork branch into the master branch, we would first have to check out the master branch. As seen earlier, to check out a branch we have to type the following command: git checkout <branch name>

Resolving a removed file conflict:

Try again using NewFile.txt Remove it from the NewWork branch and then modify it in masterdo all the follwing commands.
git rm NewFile.txt
git commit -m "NewFile.txt removed"
git checkout -
echo "this file has not to be removed" >> NewFile.txt
git add NewFile.txt
git commit -m "Edited NewFile.txt"
git merge NetWork
git status
git add NewFile.txt
git commit

Stashing:

we have some modifications that are not ready to be committed, because they are partial, inconsistent, or even won't compile. In this situation, Git prevents you from switching to another branch. You can only switch from one branch to another if you are in a clean state. following these step.

echo "new line Added" >> NewFile.txt
git checkout -
git stash
git status
git stash list
git stash apply

Msalmanzafar / Git-practice-for-test