1. The local and remote repositories only interact when you run one of the four network commands in Git: git clone, git fetch, git pull, and git push.
2. You can't create commits without these settings, so set them yourself using your command line application:
git config --global user.name "First Last"
and then enter,
git config --global user.email "you@email.com"
Note: You won't see any confirmation that this worked, but as long as you don't see an error, you're set!
3. Configure autocrlf
Next, we set core.autocrlf (autocrlf stands for auto carriage return line feed). Different systems handle line endings and line breaks differently. If you open a file created on another operating system and do not have this config option set, Git will think you made changes to the file based on the way your operating system handles the line endings.
For Windows users enter:
git config --global core.autocrlf true
4. git checkout myfeaturebranch for swith into myfeaturebranch.
5. Let’s take another look at our repository status: git status.
IMPORTANT =>
1. first checkout (switch branch) 2. git pull (for retrive) 3. git merge origin/RBKQA (for merge all files in current branch) 4. make changes
5. staged your changes 6. commit & push.
Done!
Additional -
git reset --merge => Abort the merge and return to the previous state.
Note:
1. Sometime if you are not using correct feature branch then it will give you error. for merging

