Differences

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

--- devops:git_practices [2022-03-22 12:53] – Johan Oxenstierna
+++ devops:git_practices [2022-09-02 16:04] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
-Perhaps it would be useful with some basic git instructions (e.g. don't push to master branch). I put some in the heron_workspace readme but perhaps more is needed
+====== Some git practice tips: ======
+  * Don't push to master branch. Work in a test branch and do a merge request to whoever maintains master branch (that may be yourself).
+  * The heron_workspace contains ~18 repositories. Make sure to be extra careful when pulling/pushing and running ''heron update'' to specific repos. If you want to read up on development where a git repository contains git repositories check vcstools https://docs.ros.org/en/independent/api/vcstools/html/ and submodules https://git-scm.com/book/en/v2/Git-Tools-Submodules .