Skip to content. | Skip to navigation

Join |
Log in

Mifos - Technology that Empowers Microfinance

Sections

Personal tools

Home > Developers > Wiki > Branching Strategy

Views

Actions

Actions
- Copy

Edit history

changed:
-#. Execute ``svnmerge merge``.
#. Execute ``svnmerge merge`` (optionally including a -r argument to cherry-pick particular changes).

added:

If merging multiple changesets fails, cherry-pick changes one-at-a-time and manually resolve any merge conflicts.