Content deleted Content added
→External links: +1 |
|||
Line 16:
TFVC supports [[Branching_%28software%29|branching]] at entire source code level as well as individual files and directory levels as well, with each branch being maintained individually. Multiple branches can be merged together, with the in built conflict resolution algorithm merging the changes between two branches of the same file where it can automatically reconcile the differences or flagging them for manual inspection if it cannot. Merge can be performed at "changeset" level as well, instead of the branch level. A successful merge is automatically checked out in the souce control repository.
===Reporting===
|