Differences

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

--- noresm:svnbestpractice [2015-04-14 07:57:43]
alfg [Branches]
+++ noresm:svnbestpractice [2022-05-31 09:29:32] (current)
@@ Line 4: / Line 4: @@
 Follow this link to find the tutorial: [[NORESM:SvnTutorial]]
+**Note: As of November 13th 2015, NorESM uses git as version control system. The rules and guidelines for merging/branching, tags and branch names are still valid in the new system**
  ===== Branches =====
@@ Line 32: / Line 34: @@
 <file>
 svn checkout $BRANCHURL nameOfBranchOnMyPC
+</file>
+In git: First create your new branch locally and then make the remote aware of the new branch like so:
+<file>
+git checkout -b my_branch_name
+git push -u origin my_branch_name
+</file>
+..and make sure your .gitconfig-file is configured for doing a merge (for example):
+<file>
+[merge]
+    tool = vimdiff
+[diff]
+   tool = vimdiff
 </file>
@@ Line 106: / Line 123: @@
 <file>
 svn merge --reintegrate $BRANCHURL
+</file>
+Using git, just use
+<file>
+git merge branchNameIWantToMergeWith
 </file>
 ===== Tags =====