Dashboard > Kuali Implementation Technical Team > ... > Version Control with SVN Policy > rSmart Build Version Merge Process

Site Search:

View • Attachments (0) • Info

rSmart Build Version Merge Process

Merge rSmart with svn-load-dirs
This will fetch rsmart and foundation code, and merge them into the respective tags.
```
% ant -Dkitt.username= -Dkitt.password= svn-load-dirs-all
```
If the latest release is build-1092, this will create a vendor/rsmart/kfs/tags/build-1092 tag
Merge new rSmart version into trunk
This will simply determine the appropriate versions to merge into trunk and perform the merge. A user needs to moderate the changes and make the final commit in case there are any merge conflicts.
```
% ant -Dkitt.username= -Dkitt.password= svn-load-dirs-all

% cd work/kfs

% status -u | grep ^C

% commit -m "Merging build-1092"
```
1. Strategy for Handling Conflicts by Use Case
  1. In Any Case
  2. C - Conflict is found in org.kuali
  3. C - Conflict is found in jsp/tag file
  4. U - Update is found in org.kuali

Browse Space
- Pages
- Labels
- Attachments
- Mail
- Bookmarks
- News
- Activity
- Advanced

Explore Confluence
- Popular Labels
- Notation Guide

Your Account
Log In

Add Content

Powered by Atlassian Confluence 1115, the Enterprise Wiki.. Contact administrators.