- Watch out your svn server version. Version < 1.5 does not have –reintegrate option.
- Your merging process may failed in the middle. Hint: shitty connection. When this happen, solve all conflict first before retry merging.
- You CAN retry merging. See above point.
- Prepare some coffee, tea, beer, vitamin, or <insert your power source here> since conflicts are common.
Neofreko
Nothing but neofreko
