Differences

This shows you the differences between two versions of the page.

--- processes:version-control [2020/02/11 10:32] – joerg.hampel
+++ processes:version-control [2023/05/23 13:21] (current) – joerg.hampel
@@ Line 5: / Line 5: @@
 ===== Introduction =====
-We use [[http://git-scm.com|git]] for distributed LabVIEW code version control. Our code repositories are managed externally on a [[https://about.gitlab.com/|GitLab]] server and internally on a Git server.
+We use [[http://git-scm.com|Git]] for distributed LabVIEW code version control. Our code repositories are managed externally on a [[https://about.gitlab.com/|GitLab]] server and internally on a Git server.
+**In order to be able to work on our LabVIEW code, you need to follow the steps described in the [[kb:scc:git:setup|setup section]] of our [[kb:scc:git:setup|Git knowledge base]]:**
+{{indexmenu>:kb:scc:git#1|tsort nsort}}
-----
+//If you only need a manual export of the contents of a repository on GitLab, you can [[https://docs.gitlab.com/ee/user/project/repository/#download-the-code-in-a-repository|simply download the source code]] instead of using git to clone it.//
-<WRAP left round info 100%>
-In order to be able to work on our LabVIEW code you need to follow the steps described in our [[kb:bestpractices:scc:git|git knowledge base]].
-</WRAP>
 ----
-===== SCC Best Practices =====
+===== SCC Better Practices =====
-You can find more information on how to work with(in) Source Code Control in our [[kb:bestpractices|Best Practices]] section:
+You can find more information on how to work with(in) Source Code Control in our [[kb:bestpractices|Better Practices]] section:
-  * [[kb:bestpractices:scc|Source Code Control]]
+{{indexmenu>:kb:bestpractices:scc#1|tsort nsort}}
-    * [[kb:bestpractices:scc:rules|Rules & Guides]]
-    * [[kb:bestpractices:scc:gitflow-workflow|Workflow Model]]
-    * [[kb:bestpractices:scc:git-submodules|Submodules]]
@@ Line 33: / Line 30: @@
 Please read [[:processes:release-management#version_numbers|Version Numbers]] for more information on our version number formats and policy.
-==== Git Tags ====
-Git does not give perfect integer revision numbers that increment on each commit. Instead, git hashes the commit data and uses that as a unique identifier of the commit. That means one commit could be ''8d844d8d...'' and the next ''f1728db4...'', which is incomprehensible AND unusable as (part of) our [[processes:release-management#version_numbers|version numbering convention]].
-However, git allows you to create descriptive labels for marking specific points in history as being important, i.e. creating pointers to specific commits. These pointers are called //tags//. Typically, tagging is used for marking release points (v1.2.3, and so on), and that's exactly what we do, as well.
-Read the [[http://git-scm.com/book/en/v2/Git-Basics-Tagging|Git Documentation]] for detailed info on how to use tags, and the [[http://www.git-tower.com/help/mac/branches-and-tags/overview|Tower Documentation]] on how to create tags with Tower.
-----
-===== Further Resources =====
-==== General ====
-  * [[http://git-scm.com/docs/gittutorial|Official Git Tutorial]]
-  * [[http://doc.gitlab.com/ee/|GitLab Documentation]]
-  * [[http://rogerdudler.github.io/git-guide/index.de.html|Simple git how-to in german]]
-==== Password Management ====
-//By courtesy of Fabiola De La Cueva//
-**pageant** is a tool that runs at startup so you only have to enter your password once:
-http://blog.shvetsov.com/2010/03/making-pageant-automatically-load-keys.html
-==== Compare / Merge VIs ====
-//By courtesy of Fabiola De La Cueva//
-Instructions on how to configure your client tool to use LabVIEW Compare and LabVIEW Merge towards the end of this article:
-http://delacor.com/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/
-==== Internal ====
-//HSE-internal resources//
-  * [[organization:infrastructure:scc|Infrastructure - SCC]]