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:55, 31 August 2012
, 14 years ago→Add an external commit into current repository
No edit summary |
|||
| Line 146: | Line 146: | ||
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). | 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). | ||
It the cherry-pick fails because of conflicts, you can cancel the cherry-pick try with | |||
<source lang="bash"> | |||
git cherry-pick --abort | |||
</source> | |||
=Solving a conflict= | =Solving a conflict= | ||