In short, it is five-step process
1. svn co trunk
2. svn merge branch (from trunk)
3. resolve all conflicts
4. test / verify (= build/install/run some binaries)
5. svn ci
In details, I found this website is awesome in understanding the procedure:
I did
- install meld
$ sudo apt-get install meld
- made svn-merge-meld and fixed svn config, following the above link
- used 'l' (L) option whenever encountered conflicts in svn merge process
No comments:
Post a Comment