Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
noresm:svnbestpractice [2015-12-11 10:37:02] alfg [SVN - Best Practice/FAQ] |
noresm:svnbestpractice [2022-05-31 09:29:32] (current) |
||
|---|---|---|---|
| Line 34: | Line 34: | ||
| < | < | ||
| svn checkout $BRANCHURL nameOfBranchOnMyPC | svn checkout $BRANCHURL nameOfBranchOnMyPC | ||
| + | </ | ||
| + | |||
| + | |||
| + | In git: First create your new branch locally and then make the remote aware of the new branch like so: | ||
| + | < | ||
| + | git checkout -b 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 108: | Line 123: | ||
| < | < | ||
| svn merge --reintegrate $BRANCHURL | svn merge --reintegrate $BRANCHURL | ||
| + | </ | ||
| + | |||
| + | Using git, just use | ||
| + | < | ||
| + | git merge branchNameIWantToMergeWith | ||
| </ | </ | ||
| ===== Tags ===== | ===== Tags ===== | ||