29,133
edits
Changes
FAQ Get,update GIT project sources (view source)
Revision as of 13:50, 14 October 2011
, 13 years ago→Commit and publish your changes
Line 65:
Line 65:
All you have to do is make a commit to validate your local repository as including your changes and changes made by others.
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 =
To commit changes you made into your local repository, right click on file or directory to commit. This will validate changes into your local repository.
To commit changes you made into your local repository, right click on file or directory to commit. This will validate changes into your local repository.
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'''".
+
+
+= Add an external commit into current repository =
+Some developers may work and do commit into their own Git repository after forking the project. If you are interesting into getting this changes, you can import them with the following steps with Eclipse:
+* First, go into GIT setup view and right click on "'''Remotes'''" of your Eclipse Git working space and choose "'''Create a remote...'''"
+* Type name or remote fork the developer has create (in most cases, it's developer Git login). For example: "'''thedevlogin'''". Choose also "'''Configure Fetch'''".
+* Type URI of Git repository of developer. For example: '''git://github.com/thedevlogin/dolibarr.git'''. Also add a refspec value to declare the branch you want to get. For example: '''refs/heads/master:refs/remotes/thedevlogin/master'''. Click "'''Save and Fetch'''". A new entry will be added into "remote tracking" makign possible to read/get commits done into this branch.
+
+Now, go on command line of your git repository (in most cases on Linux, it's '''/home/yourlogin/git/yourdolibarr''') and type the git cherry-pick command:
+<source lang="bash">
+git cherry-pick commitid
+</source>
+where commitid is value of commit id you want to get.
+
+Once this is done, go back to Eclipse and make a refresh on project. You will see modified files appears with decorators (with conflicts if there is).
=Solving a conflict=
=Solving a conflict=