Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | |||
| public:user_software:documentation:lofarsvn [2017-09-21 09:50] – Added the --dry-run option to the svn merge example. This will avoid copy/paste disasters. Thomas Jürges | public:user_software:documentation:lofarsvn [2018-11-16 15:18] (current) – [Preparing the reintegration of your TASK! branch with the parent branch] Added a reminder about how to find out what the parent of my task branch is Thomas Jürges | ||
|---|---|---|---|
| Line 224: | Line 224: | ||
| == Let's merge == | == Let's merge == | ||
| + | |||
| + | If you are like me then it is possible that you have forgotten what the parent of your task branch is. In this case the command | ||
| + | < | ||
| + | svn log --stop-on-copy --verbose | tail -n 20 | ||
| + | </ | ||
| + | comes handy. | ||
| So, let's merge the changes from the trunk (in this example!) into your task branch. Make sure you're at the top-level '' | So, let's merge the changes from the trunk (in this example!) into your task branch. Make sure you're at the top-level '' | ||