forum/version 3 upgradegit-annexhttp://git-annex.branchable.com/forum/version_3_upgrade/git-annexikiwiki2013-11-27T22:47:37Zcomment 1http://git-annex.branchable.com/forum/version_3_upgrade/comment_1_05fc9c9cad26c520bebb98c852c71e35/joey2013-11-27T22:47:37Z2011-08-17T01:33:08Z
<p>It's ok that <code>git pull</code> does not merge the git-annex branch. You can merge it with <code>git annex merge</code>, or it will be done
automatically when you use other git-annex commands.</p>
<p>If you use <code>git pull</code> and <code>git push</code> without any options, the defaults will make git pull and push the git-annex branch automatically.</p>
<p>But if you're in the habit of doing <code>git push origin master</code>, that won't cause the git-annex branch to be pushed (use <code>git push origin git-annex</code> to manually push it then). Similarly, <code>git pull origin master</code> won't pull it. And also, the <code>remote.origin.fetch</code> setting in <code>.git/config</code> can be modified in ways that make <code>git pull</code> not automatically pull the git-annex branch. So those are the things to avoid after upgrade to v3, basically.</p>