ManageAllAdminScriptsWithGit - Revision history

ROMAIN ROUGNY rrougny@vub.ac.be: /* Working with Branches */

2019-05-08T13:59:33Z

Working with Branches

← Older revision		Revision as of 13:59, 8 May 2019
Line 104:		Line 104:
	Fetch the upstream changes and synchronize with your own origin:		Fetch the upstream changes and synchronize with your own origin:
	<pre>		<pre>
	git ~~fetch~~ upstream		git pull upstream master
	~~git merge upstream/~~master
	</pre>		</pre>

STEPHANE GERARD stgerard@vub.ac.be: /* Working with Branches */

2019-03-22T15:49:59Z

Working with Branches

← Older revision		Revision as of 15:49, 22 March 2019
Line 109:		Line 109:

	All your changes can be pushed straight to your master since it is the fork:		All your changes can be pushed straight to your master since it is the fork:
	</pre>		<pre>
	git push origin master		git push origin master
	</pre>		</pre>

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:42:12Z

working with branches

← Older revision		Revision as of 14:42, 22 March 2019
Line 71:		Line 71:
	<br>		<br>

	=== ~~working~~ with ~~branches~~ ===		=== Working with Branches ===
	If you want to work with branches, this is the workflow <br><br>		If you want to work with branches, this is the workflow <br><br>

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:41:40Z

working with branches

← Older revision		Revision as of 14:41, 22 March 2019
Line 84:		Line 84:
	</pre>		</pre>
	Notice the username! <br>		Notice the username! <br>
	You can now work on your own fork. You can ~~crated~~ branches in the fork (see the previous section) <br>		You can now work on your own fork. You can create branches in the fork (see the previous section) <br>
	<br>		<br>
	If the remote master changes, you need to synchronize. You can see which forks are available to you:		If the remote master changes, you need to synchronize. You can see which forks are available to you:

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:40:51Z

working with branches

@@ Line 77: / Line 77: @@
 There is a little icon on the page that says 'fork'. Click on it it and follow the instructions.<br>
 You will then be taken to the web page of your clone. This is now the page that you need to clone.<br>
-Click the little icon with 'clone' to get the exact address.<br><br><br>
+Click the little icon with 'clone' to get the exact address.<br><br>
 Now, go to a terminal.
@@ Line 92: / Line 91: @@
 origin  git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (fetch)
 origin  git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (push)
 </pre>

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:37:17Z

working with branches

← Older revision		Revision as of 14:37, 22 March 2019
Line 83:		Line 83:
	<pre>		<pre>
	git clone git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git		git clone git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git
	<\pre>		</pre>
	Notice the username! <br>		Notice the username! <br>
	You can now work on your own fork. You can crated branches in the fork (see the previous section) <br>		You can now work on your own fork. You can crated branches in the fork (see the previous section) <br>
Line 92:		Line 92:
	origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (fetch)		origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (fetch)
	origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (push)		origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (push)
	<\pre>		</pre>

	=== Adding /scripts to a machine and getting access to it ===		=== Adding /scripts to a machine and getting access to it ===
Line 117:		Line 117:

	<br>		<br>

	=== Old Wiki page for using SVN ===		=== Old Wiki page for using SVN ===
	*[[ManageAllAdminScriptsWithSVN\| here]]		*[[ManageAllAdminScriptsWithSVN\| here]]

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:36:45Z

working with branches

← Older revision		Revision as of 14:36, 22 March 2019
Line 72:		Line 72:

	=== working with branches ===		=== working with branches ===
	If you want to work with branches, this is the workflow		If you want to work with branches, this is the workflow <br><br>

	First, go to https://gitlab.iihe.ac.be. Go to the project you want to fork.		First, go to https://gitlab.iihe.ac.be. Go to the project you want to fork. <br>
	There is a little icon on the page that says 'fork'. Click on it it and follow the instructions.		There is a little icon on the page that says 'fork'. Click on it it and follow the instructions.<br>
	You will then be taken to the web page of your clone. This is now the page that you need to clone.		You will then be taken to the web page of your clone. This is now the page that you need to clone.<br>
	Click the little icon with 'clone' to get the exact address.		Click the little icon with 'clone' to get the exact address.<br><br><br>


	Now, go to a terminal.		Now, go to a terminal.
			<pre>
			git clone git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git
			<\pre>
			Notice the username! <br>
			You can now work on your own fork. You can crated branches in the fork (see the previous section) <br>
			<br>
			If the remote master changes, you need to synchronize. You can see which forks are available to you:
			<pre>
			git remote -v
			origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (fetch)
			origin git@gitlab.iihe.ac.be:Olivier/iihe-scripts.git (push)
			<\pre>

	=== Adding /scripts to a machine and getting access to it ===		=== Adding /scripts to a machine and getting access to it ===

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* working with branches */

2019-03-22T14:29:02Z

working with branches

← Older revision		Revision as of 14:29, 22 March 2019
Line 72:		Line 72:

	=== working with branches ===		=== working with branches ===
			If you want to work with branches, this is the workflow

			First, go to https://gitlab.iihe.ac.be. Go to the project you want to fork.
			There is a little icon on the page that says 'fork'. Click on it it and follow the instructions.
			You will then be taken to the web page of your clone. This is now the page that you need to clone.
			Click the little icon with 'clone' to get the exact address.


			Now, go to a terminal.

	=== Adding /scripts to a machine and getting access to it ===		=== Adding /scripts to a machine and getting access to it ===

OLIVIER DEVROEDE omdevroe@vub.ac.be: /* Adding /scripts to a machine and getting access to it */

2019-03-22T14:24:59Z

Adding /scripts to a machine and getting access to it

← Older revision		Revision as of 14:24, 22 March 2019
Line 70:		Line 70:

	<br>		<br>

			=== working with branches ===


	=== Adding /scripts to a machine and getting access to it ===		=== Adding /scripts to a machine and getting access to it ===
Line 77:		Line 80:
	* It is in read-only for non-root users of the '''admins''' group, so you cannot make any modifications there.		* It is in read-only for non-root users of the '''admins''' group, so you cannot make any modifications there.
	* If you want access as non-root user, you need to add yourself in [http://freeipa.wn.iihe.ac.be freeipa] [accessible through tunnel only] to the '''admins''' group.		* If you want access as non-root user, you need to add yourself in [http://freeipa.wn.iihe.ac.be freeipa] [accessible through tunnel only] to the '''admins''' group.


	=== Clean local branches ===		=== Clean local branches ===

Rougny Romain rrougny@ua.ac.be at 14:59, 20 June 2017

2017-06-20T14:59:29Z

@@ Line 77: / Line 77: @@
 * It is in read-only for non-root users of the '''admins''' group, so you cannot make any modifications there.
 * If you want access as non-root user, you need to add yourself in [http://freeipa.wn.iihe.ac.be freeipa] [accessible through tunnel only] to the '''admins''' group.
 <br>
 === Old Wiki page for using SVN ===
 *[[ManageAllAdminScriptsWithSVN| here]]