Git 101 - Revision history

Rodolakis: /* GitLab */

2024-08-08T18:16:02Z

GitLab

← Older revision		Revision as of 18:16, 8 August 2024
Line 48:		Line 48:

	GitLab is typically used for internal project (e.g. IOCs, UI screens...). APS hosts its own GitLab service: https://git.aps.anl.gov. Contact your IT contact to get access.		GitLab is typically used for internal project (e.g. IOCs, UI screens...). APS hosts its own GitLab service: https://git.aps.anl.gov. Contact your IT contact to get access.
	* ~~APS~~ GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY		* GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY
	* BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.		* BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.
	* It is recommended to use your beamline group vs individual account to host shared project (individual accounts are deleted when employee leave the lab).		* It is recommended to use your beamline group vs individual account to host shared project (individual accounts are deleted when employee leave the lab).

Rodolakis: /* GitHub vs GitLab: What should I use? */

2024-08-08T18:14:35Z

GitHub vs GitLab: What should I use?

← Older revision		Revision as of 18:14, 8 August 2024
Line 37:		Line 37:
	===== GitHub =====		===== GitHub =====

	GitHub ~~https://github.com~~ is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* It is recommended to use an organization vs individual account to host shared project (e.g. beamline software).		* It is recommended to use an organization vs individual account to host shared project (e.g. beamline software).
Line 47:		Line 47:
	===== GitLab =====		===== GitLab =====

	~~APS's~~ GitLab ~~(https://git.aps.anl.gov)~~ is typically used for internal project (e.g. IOCs, UI screens...)		GitLab is typically used for internal project (e.g. IOCs, UI screens...). APS hosts its own GitLab service: https://git.aps.anl.gov. Contact your IT contact to get access.
	* APS GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY		* APS GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY
	* BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.		* BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.

Rodolakis: /* GitHub vs GitLab: What should I use? */

2024-08-08T18:10:55Z

GitHub vs GitLab: What should I use?

← Older revision		Revision as of 18:10, 8 August 2024
Line 40:		Line 40:
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* It is recommended to use an organization vs individual account to host shared project (e.g. beamline software).		* It is recommended to use an organization vs individual account to host shared project (e.g. beamline software).
	* The naming convention recommended for ~~the~~ beamline organization is: APS-SSS-GGG		* The naming convention recommended for a given beamline organization is: APS-SSS-GGG
	** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)		** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)
	** GGG: operating group (e.g. MM for XSD - Magnetic Material)		** GGG: operating group (e.g. MM for XSD - Magnetic Material)

Rodolakis: /* GitHub */

2024-08-08T18:10:34Z

GitHub

← Older revision		Revision as of 18:10, 8 August 2024
Line 39:		Line 39:
	GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* It is recommended to use an organization vs individual account to host shared project.		* It is recommended to use an organization vs individual account to host shared project (e.g. beamline software).
	* The naming convention recommended for the beamline organization is: APS-SSS-GGG		* The naming convention recommended for the beamline organization is: APS-SSS-GGG
	** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)		** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)

Rodolakis: /* GitHub vs GitLab: What should I use? */

2024-08-08T18:09:45Z

GitHub vs GitLab: What should I use?

← Older revision		Revision as of 18:09, 8 August 2024
Line 39:		Line 39:
	GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* BCDA organization: https://github.com/BCDA-APS
	* It is recommended to use an organization vs individual account to host shared project.		* It is recommended to use an organization vs individual account to host shared project.
	* The naming convention recommended for the beamline organization is: APS-SSS-GGG		* The naming convention recommended for the beamline organization is: APS-SSS-GGG
	** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)		** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)
	** GGG: operating group (e.g. MM for XSD - Magnetic Material)		** GGG: operating group (e.g. MM for XSD - Magnetic Material)
			* BCDA organization: https://github.com/BCDA-APS

	===== GitLab =====		===== GitLab =====

Rodolakis: /* GitHub vs GitLab: What should I use? */

2024-08-08T18:09:15Z

GitHub vs GitLab: What should I use?

← Older revision		Revision as of 18:09, 8 August 2024
Line 38:		Line 38:

	GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (i.e. your own GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* BCDA organization: https://github.com/BCDA-APS		* BCDA organization: https://github.com/BCDA-APS
	* It is recommended to use an organization vs individual account to host shared project.		* It is recommended to use an organization vs individual account to host shared project.

Rodolakis: /* GitHub */

2024-08-08T18:08:58Z

GitHub

← Older revision		Revision as of 18:08, 8 August 2024
Line 38:		Line 38:

	GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* BCDA organization: https://github.com/BCDA-APS		* BCDA organization: https://github.com/BCDA-APS
	* It is recommended to use an organization vs individual account to host shared project.		* It is recommended to use an organization vs individual account to host shared project.

Rodolakis: /* GitHub */

2024-08-08T18:08:47Z

GitHub

← Older revision		Revision as of 18:08, 8 August 2024
Line 38:		Line 38:

	GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your ~~github~~ account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your GitHub account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* BCDA organization: https://github.com/BCDA-APS		* BCDA organization: https://github.com/BCDA-APS
	* It is recommended to use an organization vs individual account to host shared project.		* It is recommended to use an organization vs individual account to host shared project.

Rodolakis: /* GitHub */

2024-08-08T18:07:49Z

GitHub

← Older revision		Revision as of 18:07, 8 August 2024
Line 37:		Line 37:
	===== GitHub =====		===== GitHub =====

	GitHub https://github.com is typically used for public project, to be shared accros user facilities ~~or with the users themselves~~ (e.g. apstools, MDA_Utilities...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities (e.g. apstools, MDA_Utilities...)
	* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your github account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your github account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	* BCDA organization: https://github.com/BCDA-APS		* BCDA organization: https://github.com/BCDA-APS

Rodolakis: /* Putting a new project/folder under version control */

2024-08-08T18:07:13Z

Putting a new project/folder under version control

← Older revision		Revision as of 18:07, 8 August 2024
Line 35:		Line 35:
	==== GitHub vs GitLab: What should I use? ====		==== GitHub vs GitLab: What should I use? ====

	* GitHub~~: https://github.com is typically used for public project, to be shared accros user facilities or with the users themselves (e.g. apstools, MDA_Utilities...)~~		===== GitHub =====
	** GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your github account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	** BCDA organization: https://github.com/BCDA-APS
	** It is recommended to use an organization vs individual account to host shared project.
	** The naming convention recommended for the beamline organization is: APS-SSS-GGG
	*** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)
	*** GGG: operating group (e.g. MM for XSD - Magnetic Material)

	* GitLab: https://git.aps.anl.gov is typically used for internal project (e.g. IOCs, UI screens...)		GitHub https://github.com is typically used for public project, to be shared accros user facilities or with the users themselves (e.g. apstools, MDA_Utilities...)
	** APS GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY		* GitHub organizes repositories using this pattern: https://github.com/ORGANIZATION/REPOSITORY, where "ORGANIZATION" is either a single user account (your github account) or a named organization (e.g. BCDA-APS or APS-29IDC-MM).
	** BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.		* BCDA organization: https://github.com/BCDA-APS
	** It is recommended to use your beamline group vs individual account to host shared project (individual accounts are deleted when employee leave the lab).		* It is recommended to use an organization vs individual account to host shared project.
			* The naming convention recommended for the beamline organization is: APS-SSS-GGG
			** SSS: sector, beamline, and station, if relevant (e.g. 29IDC)
			** GGG: operating group (e.g. MM for XSD - Magnetic Material)

			===== GitLab =====

			APS's GitLab (https://git.aps.anl.gov) is typically used for internal project (e.g. IOCs, UI screens...)
			* APS GitLab organizes repositories using this pattern: https://git.aps.anl.gov/GROUP/REPOSITORY
			* BCDA maintains group for each beamline; ask your BCDA contact to be added to your beamline group.
			* It is recommended to use your beamline group vs individual account to host shared project (individual accounts are deleted when employee leave the lab).

	==== Example on GitLab ====		==== Example on GitLab ====