Changes

Line 73: Line 73:  
=Solving a conflict=
 
=Solving a conflict=
 
If a file has been marked as "conflict" after a Pull request, open the file to edit it.
 
If a file has been marked as "conflict" after a Pull request, open the file to edit it.
Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". Then, go right click on file and select "Add".
+
Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>".  
If you prefer to forget completely all changes you made into all files (so to restore you workspace with content of remote repository), right click on project top line and select "'''Reset'''" then "'''Hard'''" then "'''Reference - HEAD'''".  
      +
Then, right click on file and select "Add".
    +
If you prefer to forget completely all changes you made into all files (so to restore you workspace with content of remote repository), you can make a hard reset:
 +
* With Eclipse, right click on project top line and select "'''Reset'''" then "'''Hard'''" then "'''Reference - HEAD'''".
 +
* Using GIT command line tool, you can achieve this with command
 +
<source lang="bash">
 +
git reset --hard HEAD
 +
</source>
    
More information in GIT usage is available [http://wiki.eclipse.org/EGit/User_Guide here].
 
More information in GIT usage is available [http://wiki.eclipse.org/EGit/User_Guide here].