From version 18.1
edited by David Nestle
on 2018/10/19 16:20
To version 19.1
edited by David Nestle
on 2019/04/25 14:36
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -22,7 +22,7 @@
22 22  = Adding new Apps and Projcts =
23 23  
24 24  * If you create a new OGEMA project via File->New->Project->OGEMA (see [[Hello-OGEMA-App-Tutorial>>doc:Tutorial Collection.Example projects.Hello OGEMA.WebHome]]) you can choose "Git" in the Location dropdown and choose a location inside a git repository. This will allow you to directly commit the new app into the respecitve repository. This available in the Eclipse Java Perspective.
25 -* If you want to copy an exising app, open the location of the source app and the destination Git repository location in your file system explorer (e.g. Windows Explorer). From Eclipse Java Perspective you can open/find such locations in the file system explorer via context menu in the Package Explorer via "Show In"->System Explorer. For OGEMA Apps and other Maven-based projects you just copy the pom.xml and the src folder. You have to open the pom.xml file and change the artifact name, typically also adapt name and description. You can then checkout the project from the Git repository into the Java Perspective as described above. All other adaptations you can make in Eclipse.
25 +* If you want to copy an exising app, open the location of the source app and the destination Git repository location in your file system explorer (e.g. Windows Explorer). From Eclipse Java Perspective you can open/find such locations in the file system explorer via context menu in the Package Explorer via "Show In"->System Explorer. For OGEMA Apps and other Maven-based projects you just copy the pom.xml and the src folder. You have to open the pom.xml file and change the artifact name, typically also adapt name and description. You can then checkout the project from the Git repository into the Java Perspective as described above. All other adaptations you can make in Eclipse.
26 26  For Rundirs you have to open the .project file and change the project name.
27 27  
28 28  = Commiting and Pushing your changes =
... ... @@ -40,3 +40,19 @@
40 40  [[image:PullSuccess.png]]
41 41  * If the Result is "Merged" as shown above finally perfom a "Push to Upstream", then you are done. In the Package Explorer you will see small arrows when the project has commits that are not in sync with the remote repository, so finally there should be no arrows anymore.
42 42  * If no automated merge is possible the Result will be "Conflicting". the conflicting files will be marked red in Eclipse. You have to edit them manually. They will contain both you changes and the changes of your colleague with a notice which content is from which source. When you finished editing you have to perform an "Add to Index" on the Conflicting file. When you have resolved all conflicts you have to perform another commit on the merge (not necessary if the automated merge was successful).
43 +
44 += Tips for using Git =
45 +
46 +* Git console commands summary: [[https:~~/~~/www.ogema-source.net/wiki/display/O2/Git%3A+commands>>https://www.ogema-source.net/wiki/display/O2/Git%3A+commands]]
47 +* Console commands for switching the remote URL of a repository:
48 +
49 +{{{git remote -v
50 +to display the current settings, e.g. output:
51 + origin (fetch)
52 + origin (push)
53 +
54 +To set new URL:
55 +git remote set-url origin <neue URL>
56 +
57 +E..g. for new OGEMA server:
58 +git remote set-url origin }}}
CommitPushRejected.png
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +41.8 KB
Content
CommitPushSuccess.png
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +48.4 KB
Content
GitMavenImport.png
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.dnestle
1 +xwiki:XWiki.dnestle
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +292.5 KB
Content
GitStagingView.png
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +152.6 KB
Content
OpenPerspective.png
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.dnestle
1 +xwiki:XWiki.dnestle
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +50.5 KB
Content
PullSuccess.png
Size
... ... @@ -1,1 +1,1 @@
1 -0 bytes
1 +63.1 KB
Content