Differences
This shows you the differences between two versions of the page.
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 | ||
+ | </ | ||
+ | |||
+ | ..and make sure your .gitconfig-file is configured for doing a merge (for example): | ||
+ | < | ||
+ | [merge] | ||
+ | tool = vimdiff | ||
+ | [diff] | ||
+ | tool = vimdiff | ||
</ | </ | ||
Line 115: | Line 123: | ||
< | < | ||
svn merge --reintegrate $BRANCHURL | svn merge --reintegrate $BRANCHURL | ||
+ | </ | ||
+ | |||
+ | Using git, just use | ||
+ | < | ||
+ | git merge branchNameIWantToMergeWith | ||
</ | </ | ||
===== Tags ===== | ===== Tags ===== |