How to contribute - Revision history

Carignani at 09:50, 14 March 2019

2019-03-14T09:50:54Z

← Older revision		Revision as of 11:50, 14 March 2019
Line 24:		Line 24:

	In GIT commands:		In GIT commands:
			<code>
	<code>$ git checkout <target-branch>~~</code>~~		$ git checkout <target-branch>
			$ git pull origin <target-branch>
	~~<code>~~$ git pull origin <target-branch>~~</code>~~		$ git branch <your-branch-name>
			$ git checkout <your-branch-name>
	~~<code>~~$ git branch <your-branch-name~~></code~~>		</code>

	~~<code>~~$ git checkout <your-branch-name></code>

	===2) Create/edit the content ===		===2) Create/edit the content ===

Carignani at 09:50, 14 March 2019

2019-03-14T09:50:13Z

← Older revision		Revision as of 11:50, 14 March 2019
Line 18:		Line 18:
	# In the menu on the left click Repository and then Branches		# In the menu on the left click Repository and then Branches
	# Click the New Branch button and fill in the required information		# Click the New Branch button and fill in the required information

			IMPORTANT: Make sure that you are creating a branch on top of the latest version of your target branch.

			E.g. if you want to contribute on the master branch, your newly created branch needs to be based on the latest commit in master.

			In GIT commands:

			<code>$ git checkout <target-branch></code>

			<code>$ git pull origin <target-branch></code>

			<code>$ git branch <your-branch-name></code>

			<code>$ git checkout <your-branch-name></code>

	===2) Create/edit the content ===		===2) Create/edit the content ===
Line 46:		Line 60:
	More information on accepting Merge Requests may be found at [[Accept Merge Request]].		More information on accepting Merge Requests may be found at [[Accept Merge Request]].

	<br/><br/><br/>		<br /><br /><br />

	{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}		{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}

Carignani at 12:54, 12 November 2018

2018-11-12T12:54:27Z

← Older revision		Revision as of 14:54, 12 November 2018
Line 38:		Line 38:
	=== 5) Notify the project leaders ===		=== 5) Notify the project leaders ===

	=== 6) ~~Approve~~ and merge the contribution ===		=== 6) Accept and merge the contribution ===

			Users with role '''Master''' in the repository will be able to accept Merge Requests into the '''master branch''' or any of the protected branches.

			Roles are mandated by the technical group who manages the repository and applied by the ETSI Staff.

			More information on accepting Merge Requests may be found at [[Accept Merge Request]].

			<br/><br/><br/>

	{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}		{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}

Carignani at 12:51, 12 November 2018

2018-11-12T12:51:05Z

← Older revision		Revision as of 14:51, 12 November 2018
Line 38:		Line 38:
	=== 5) Notify the project leaders ===		=== 5) Notify the project leaders ===

			=== 6) Approve and merge the contribution ===
	{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}		{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}

Carignani at 12:30, 12 November 2018

2018-11-12T12:30:36Z

← Older revision		Revision as of 14:30, 12 November 2018
Line 26:		Line 26:
	=== 3) Save your change in your working branch on the server ===		=== 3) Save your change in your working branch on the server ===

	====~~= Using git =~~====		==== Web Interface ====

	===== git push origin <local-branch>:<remote-branch~~> =====~~		==== Using git ====

			Assuming you want to push a local-branch onto a remote-branch, you want to use the command:

			git push origin local-branch:remote-branch

	=== 4) Create a Merge request against master or your target branch ===		=== 4) Create a Merge request against master or your target branch ===

Carignani at 12:29, 12 November 2018

2018-11-12T12:29:03Z

← Older revision		Revision as of 14:29, 12 November 2018
Line 4:		Line 4:
	In the following we will assume you successfully		In the following we will assume you successfully
	* followed the [[Get started\|Getting started]] guide,		* followed the [[Get started\|Getting started]] guide,
	* (Optional) [[Configure your git environment\|Configured your git environment]].		* ('''Optional''') [[Configure your git environment\|Configured your git environment]].
	* [[Clone a repository\|Cloned the repository]].		* ('''Optional''') [[Clone a repository\|Cloned the repository]].

	= Upload your contribution =		= Upload your contribution =

	=== ~~(Optional~~) Create a ~~new~~ branch for your contribution ===		===1) Create a working branch for your contribution ===
	'''Advanced users''': forking will work as well but you will need to setup your CI environment		'''Advanced users''': forking will work as well but you will need to setup your CI environment

	~~=== Create/edit~~ the ~~content ===~~		A Git repository is organized in branches, each containing slightly different versions of the project built on others. '''A working branch is the location for you code contribution to be reviewed'''.
	~~Beginners: Use the online edit area or~~ the ~~Web Ide~~.
	~~Advanced users: Edit and commit content in your local repository~~

	~~=== Save your change~~ in ~~your working branch ===~~		To create a new branch using the web interface:
			# Visit the project page
			# In the menu on the left click Repository and then Branches
			# Click the New Branch button and fill in the required information

	=== Create ~~a Merge request against master or your target branch~~ ===		===2) Create/edit the content ===
			'''Beginners''': Use the online edit area or the Web Ide.

			'''Advanced users''': Edit and commit content in your local repository

			=== 3) Save your change in your working branch on the server ===

			===== Using git =====

			===== git push origin <local-branch>:<remote-branch> =====

			=== 4) Create a Merge request against master or your target branch ===

			=== 5) Notify the project leaders ===

	{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}		{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}


	= Using git push ==		= Using git push ==

Carignani at 12:21, 12 November 2018

2018-11-12T12:21:02Z

← Older revision		Revision as of 14:21, 12 November 2018
Line 1:		Line 1:
	__TOC__		__TOC__

	~~{{Warning\|This page needs revision. Some of the information in the page may be deprecated.}}~~

	= Pre-requisites =		= Pre-requisites =
Line 15:		Line 13:

	=== Create/edit the content ===		=== Create/edit the content ===
	# Beginners: Use the online edit area or the Web Ide.		Beginners: Use the online edit area or the Web Ide.
	## Advanced users: Edit and commit content in your local repository		Advanced users: Edit and commit content in your local repository

	=== Save your change in your working branch ===		=== Save your change in your working branch ===

	=== Create a Merge request against master or your target branch ===		=== Create a Merge request against master or your target branch ===


			{{Warning\|The rest of the page needs revision. Some of the information in the page may be deprecated.}}


	= Using git push ==		= Using git push ==

Carignani at 12:20, 12 November 2018

2018-11-12T12:20:18Z

← Older revision		Revision as of 14:20, 12 November 2018
Line 10:		Line 10:

	= Upload your contribution =		= Upload your contribution =

			=== (Optional) Create a new branch for your contribution ===
			'''Advanced users''': forking will work as well but you will need to setup your CI environment

			=== Create/edit the content ===
			# Beginners: Use the online edit area or the Web Ide.
			## Advanced users: Edit and commit content in your local repository

			=== Save your change in your working branch ===

			=== Create a Merge request against master or your target branch ===

	= Using git push ==		= Using git push ==

Carignani at 12:15, 12 November 2018

2018-11-12T12:15:27Z

@@ Line 1: / Line 1: @@
 __TOC__
-<div style="font-size:14pt; color: red; border:1px solid red; text-align:center">
+{{Warning|This page needs revision. Some of the information in the page may be deprecated.}}
-== Pre-requisites ==
+= Pre-requisites =
 In the following we will assume you successfully
 * followed the [[Get started|Getting started]] guide,
@@ Line 11: / Line 9: @@
 * [[Clone a repository|Cloned the repository]].
+= Upload your contribution =
-==Developer's Certificate of Origin==
+= Using git push ==
 . To avoid merge conflicts, it is recommended to do a pull with rebase before pushing your contribution in order to merge latest changes made by other users.
   git pull --rebase

Carignani at 12:02, 12 November 2018

2018-11-12T12:02:04Z

@@ Line 5: / Line 5: @@
 </div>
-= Login to ETSI Forge =
+== Pre-requisites ==
-# Go to the FORGE portal: https://forge.etsi.org/
+In the following we will assume you successfully
-# Login using your username and password at https://forge.etsi.org/index.php/users/login/
+* followed the [[Get started|Getting started]] guide,
-# If you are an ETSI Online Account (EOL) holder then please use the EOL credentials
+* (Optional) [[Configure your git environment|Configured your git environment]].
-# Otherwise register for a local acocunt at https://forge.etsi.org/index.php/register
+* [[Clone a repository|Cloned the repository]].
-'''Note:'''  http://webapp.etsi.org/createaccount/
 ==Developer's Certificate of Origin==
@@ Line 145: / Line 87: @@
 Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and  Abandoned Changes.
-Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)
+Link: https://osm.etsi.org/gerrit/#/settings/projects (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)
 = Continuous Integration =
@@ Line 213: / Line 155: @@
 . Pull the patch on the created branch. (To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the "pull" command.)
-  git pull <url> <ref>
+  git pull <url> <nowiki><ref></nowiki>
 . Fix the code.