summaryrefslogtreecommitdiff
path: root/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment
blob: f3e8ec690b693b56a339ce3bfc6a02aa3e004526 (plain)
1
2
3
4
5
6
7
8
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="4.154.0.21"
 subject="re: workaround"
 date="2013-07-30T19:17:11Z"
 content="""
The problem with manually merging the branches and not using sync is that the file mappings get out of date. You should be able to correct them by running `git annex fsck`
"""]]