Repository-based Configuration Management > Overview of repository-based configuration management (repository-based CM) > Working with change tracking (repository-based CM)
  
Working with change tracking (repository-based CM)
If you want to track the changes being made in your branch through Change Notes, we recommend the following strategy:
Create a branch to implement all the changes required for a Change Note - use that Change Note to track changes only in that branch.
After all changes have been made to implement the Change Note, reconcile the branch.
Notes
A reconcile operation does not change the change tracking status in the target model, that is, whether change tracking is enabled or disabled.
When a rebase or reconcile operation results in conflicts and change tracking is enabled, Modeler creates a Change Note in the resultant model that records which items are affected by the conflicts. The name of the Change Note begins with 'Conflicts: '.
* 
If a rebase or reconcile operation results in conflicts, the resultant model is left unprotected so that you can resolve those conflicts. After resolving the conflicts, ensure that you protect the model version, so that there is a record of the resultant model from the rebase or reconcile operation.
When a rebase or reconcile operation results in clashes and change tracking is enabled, Modeler creates a Change Note in the resultant model that records the clashes and the decisions made for those clashes. The name of the Change Note begins with 'Clashes: '.