501cc8623a
When in direct mode, update the master branch after committing to the annex/direct/master branch. Also, update the synced/master branch. This fixes a topology A->B where both A and B are in direct mode and running the assistant, and a change is made to B. Before this fix, A pulled the changes from B, but since they were only on the annex/direct/master branch, it did not merge them. Note that I considered making the assistant merge the remotes/B/annex/direct/master, but decided to keep it simple and only merge the sync branches as before. |
||
---|---|---|
.. | ||
Android | ||
android | ||
assistant | ||
automatic_conflict_resolution | ||
backends | ||
bare_repositories | ||
bugs | ||
contact | ||
copies | ||
design | ||
devblog | ||
direct_mode | ||
download | ||
ekg | ||
encryption | ||
footer | ||
forum | ||
how_it_works | ||
install | ||
internals | ||
license | ||
links | ||
metadata | ||
news | ||
not | ||
polls | ||
preferred_content | ||
special_remotes | ||
sync | ||
templates | ||
testimonials | ||
tips | ||
todo | ||
upgrades | ||
use_case | ||
users | ||
videos | ||
walkthrough | ||
Android.mdwn | ||
assistant.mdwn | ||
automatic_conflict_resolution.mdwn | ||
backends.mdwn | ||
bare_repositories.mdwn | ||
bugs.mdwn | ||
builds.mdwn | ||
coding_style.mdwn | ||
comments.mdwn | ||
contact.mdwn | ||
contribute.mdwn | ||
copies.mdwn | ||
design.mdwn | ||
devblog.mdwn | ||
direct_mode.mdwn | ||
distributed_version_control.mdwn | ||
download.mdwn | ||
ekg.mdwn | ||
encryption.mdwn | ||
favicon.ico | ||
feeds.mdwn | ||
forum.mdwn | ||
future_proofing.mdwn | ||
git-annex-shell.mdwn | ||
git-annex.mdwn | ||
git-union-merge.mdwn | ||
how_it_works.mdwn | ||
index.mdwn | ||
install.mdwn | ||
internals.mdwn | ||
license.mdwn | ||
location_tracking.mdwn | ||
logo-old-bw.svg | ||
logo-old.png | ||
logo-old.svg | ||
logo-old_small.png | ||
logo.mdwn | ||
logo.svg | ||
logo_16x16.png | ||
logo_32x32.png | ||
logo_small.png | ||
meta.mdwn | ||
metadata.mdwn | ||
news.mdwn | ||
not.mdwn | ||
polls.mdwn | ||
preferred_content.mdwn | ||
privacy.mdwn | ||
publicrepos.mdwn | ||
related_software.mdwn | ||
repomap.png | ||
required_content.mdwn | ||
scalability.mdwn | ||
shortcuts.mdwn | ||
sidebar.mdwn | ||
sitemap.mdwn | ||
special_remotes.mdwn | ||
summary.mdwn | ||
sync.mdwn | ||
testimonials.mdwn | ||
thanks.mdwn | ||
tips.mdwn | ||
todo.mdwn | ||
transferring_data.mdwn | ||
trust.mdwn | ||
upgrades.mdwn | ||
users.mdwn | ||
videos.mdwn | ||
walkthrough.mdwn |