noresm:svnbestpractice

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision 		Previous revision
noresm:svnbestpractice [2016-03-02 10:09:08]
alfg 		noresm:svnbestpractice [2022-05-31 09:29:32] (current)
Line 41: Line 41:
 git checkout -b my_branch_name git checkout -b my_branch_name
 git push -u origin 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> </file>
  
Line 115: Line 123:
 <file> <file>
 svn merge --reintegrate $BRANCHURL svn merge --reintegrate $BRANCHURL
 +</file>
 +
 +Using git, just use
 +<file>
 +git merge branchNameIWantToMergeWith
 </file> </file>
 ===== Tags ===== ===== Tags =====
  • noresm/svnbestpractice.1456913348.txt.gz
  • Last modified: 2022-05-31 09:23:24
  • (external edit)