29,033
edits
Changes
FAQ Get,update GIT project sources (view source)
Revision as of 22:19, 21 September 2011
, 13 years ago→Commit and publish your changes
Line 57:
Line 57:
To upload them on the remote GIT repository, right click on project and choose "Team - Push to Upstream".
To upload them on the remote GIT repository, right click on project and choose "Team - Push to Upstream".
+
+
+=Solving a conflict=
+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".
+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'''".
+
+
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].