Fix rare bug in sync view compressed mode where items are in the wrong place
Created a dialog window with Rebase, Merge and Cancel options.
Check for multiple heads when updating from Synchronize View
Improved cross branches handling. Asking user if he wants to merge two heads. If there are more heads user notified that manual merge needed.
Merge with 5b1848babf138d8e17a740c65beb805ee5170ab7 - We've been using it for 2 days and it seems stable
Fix bug with merge view not being populated on conflicted rebase sometimes
Fix bug in compressed mode that appears on Windows
Backed out of changeset 2240:29dcdfe9e199
Merge with 6ab4629f0f117fef2b13ef23c0a271e322a54621
Simpler alternative to previous commit
Maintain selection by maintaining identity of nodes. #10624 is feature complete
Fix bug with compressed mode
Use persisted preference and update view when preference changes. #10624 is mostly complete
Basic sync view functionality for tree and compressed tree mode
Minor cleanup