21
edits
Changes
→start working on a project
#: Note that, the merging happens on the local copy and not the repository
# Edit possible conflicts, save and mark them as resolved when done.
# Compilethe trunk, test and make sure the changes are what you want
# In trunk, apply more changes and do debugging if needed.
#: note that this is the only time you do work in trunk