30,997
edits
FAQ Récupérer, mettre à jour les sources GIT du projet: Difference between revisions
Jump to navigation
Jump to search
FAQ Récupérer, mettre à jour les sources GIT du projet (view source)
Revision as of 12:49, 13 October 2011
, 15 years agono edit summary
No edit summary |
|||
| Line 17: | Line 17: | ||
First, enter value of the repository with reference sources into your GIT client tool. | First, enter value of the repository with reference sources into your GIT client tool. | ||
With Eclipse, choose "Clone GIT repository". Enter GIT URL of project to get. | |||
* With Eclipse, choose "Clone GIT repository". Enter GIT URL of project to get. | |||
GIT Url for Dolibarr official source is: | GIT Url for Dolibarr official source is: | ||
<source lang="ini"> | <source lang="ini"> | ||
git://github.com/Dolibarr/dolibarr.git | git://github.com/Dolibarr/dolibarr.git | ||
</source> | </source> | ||
Your Eclipse GIT client will ask you to choose the branches you are interesting in. Branches not selected now could be selected later by doing a "Fetch" from the "Remotes" view, but try to choose only the branch you need. This will save you time and problems later. | |||
* With GIT on Command Line Interface: | |||
<source lang="bash"> | |||
git clone git://github.com/Dolibarr/dolibarr.git dolibarr | |||
</source> | |||
Once this step is validated, your GIT client will download all files from remote GIT server. This may last several seconds or minutes. | Once this step is validated, your GIT client will download all files from remote GIT server. This may last several seconds or minutes. | ||
| Line 37: | Line 42: | ||
=Get last version of sources using a full GIT access= | =Get last version of sources using a full GIT access= | ||
You must before create an account on GitHub (https://github.com/) and upload a public RSA or DSA certificate into your account profile. | |||
Then process is same than getting sources with anonymous access. | |||
URL to use for GIT clone is same: | URL to use for GIT clone is same: | ||
| Line 52: | Line 58: | ||
=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 | |||
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= | ||
| Line 61: | 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 ">>>>>>> | Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". | ||
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]. | ||
| Line 73: | Line 91: | ||
For this, go on page with [http://www.dolibarr.org/downloads/cat_view/64-development-version last source version of the day]. | For this, go on page with [http://www.dolibarr.org/downloads/cat_view/64-development-version last source version of the day]. | ||
New | New files overwrite old ones. | ||
The inconvenient of this method is that you must download and uncompress package each time you want to get updates. | The inconvenient of this method is that you must download and uncompress package each time you want to get updates. | ||