making sure we set the id before setting non json values

exposing method to get merge conflict commit message

adding reset specifically for file changes

adding separate method for getting remote tracking branch

adding null check for property info on value provider

making sure at least TrackedItem is passed back for diffs on content …

…types that may not exist anymore

falling back to TrackedItem if content type is not currently loaded

making it so that you can have multiple CRUD operations per tracked item

reverting last change

adding IFileSystem to injection helper method