Git Steps with the same IDE (Eclipse, without a difftool,mergetool)

StepsToGitIt

First go to the local repo which is project folder

1.git status 
See the modified changes , now

2. Adding all files
git add .

Note:below only pushes the changes to local repo
3.git commit -m "Changes"


4.git pull
Below will then bring all the changes (Automerge happens), if any conflicts

If any conflicts found , Go to eclipse , change the code accordingly 
(<<< will the outbound code (our new uncommitted code), ===== will be the commited to be merged code )
choice is made of the code .Same can be done with any difftool like MELD also.


then
Just checking again
5.git status

Add all the files (could have been changes)
6.git add .
7.git commit (optional)

To see if there is anymore conflicts 
8.git pull 

Finally pushing to remote Repository
9.git push origin master