Thursday 30 June 2016

fatal: Exiting because of unfinished merge. git commit error while pull/push files


Using Git Integration


Today i am going to show how to solved git merge error when two different developer work in same projects

 If some one is work in same file and both are changes in that, SO on that time we face this problem .


we have to revert any of one buddy file,

Here Some tutorial are below  :

https://www.atlassian.com/git/tutorials/



BUT By write some command we solve that Problem


git fetch origin 
git reset --hard origin/master 
git pull



Or Second thing is below . 








Prepare :

At the first, you should install Git for Windows.
And then, Setting git tools path for Android Studio.
File > Settings > Version Control > Git
You can click Test button to check function. Such as figure below.


Step 1 : Enable Version Control Integration(git init)

VCS > Enable Version Control Integration > select "Git"
And then, you will discovery that your project list changed color. Like figure.


Step 2 : Git Add Remote

In this step, Android Studio doesn't provide GUI to work, We should use Git for Windows tool.
Go find Git Bash in git folder.
  1. Git Bash > Go to Project folder
  2. Git Bash > key in add remote command
    Ex: git remote add origin git@192.168.0.1:user/android-studio-git.git

use command git gui 

using of this command we can solved our problem . 




Thanks for watching .....


No comments:

Post a Comment