29,113
edits
Changes
FAQ Get,update GIT project sources (view source)
Revision as of 20:59, 26 September 2011
, 13 years ago→Update your repository
Line 51:
Line 51:
+
+
=Update your repository=
=Update your repository=
To update your local workspace, right click on Eclipse project and select "Pull".
To update your local workspace, right click on Eclipse project and select "Pull".
−If made some changes into your Eclipse workspace on files that were changed into the GIT remote reference, your GIT client will make a merge automatically and will mark all conflict files as "conflict" (See later to solve this state). If not, you will get all new version files including all your changes.
+If you made some changes into your Eclipse workspace on files that were changed into the GIT remote reference, your GIT client will make a merge automatically.
+* If there is conflicts, the merge will mark all conflict files as "conflict" (See later to solve this state).
+* If not, you will get all new version files including all your changes.
+If you already have commited some files into your local repository, your workspace will be marked as "Merged".
+All you have to do is make a commit to validate your local repository as including your changes and changes made by others.
=Commit and publish your changes=
=Commit and publish your changes=