Regarding the synchronizing of directories on two or more machines, using a USB Stick.  Further questions after a bit of experimentation.  <br> <br>I am currently keeping two workstations up to date via a USB flash drive, and have had, variously, both good and bad luck. Here are some questions:<br>
<br>1.  I understand the idea, finally, of using a &quot;bare&quot; repo on the fiash drive, at least in part.  But what will I do if the bare repo fails to merge because two versions are pushed or pulled to it from the two machines, of a file.  I&#39;ve wasted a bit of time and now have gotten &quot;meld&quot; installed as the mergetool.  Still, sometimes even that doesn&#39;t work.  Today I have two flash drives in use, one that was working fine to update from one machine, but won&#39;t even accept a file from the other.  I have clumsily deleted the old version from the USB drive, and copied over the other version, done git rm &lt;oldfile&gt; git add &lt;file&gt; and git commit -a, but the file refuses to install.  I&#39;m not going to ask this as a primary question, because I think I need to just understand the underlying idea of using a bare repo, and not editing it at all.  <br>
<br>2.  I have had poor luck with push. <br><br>3.  For this simple usage, is it even useful to think about branches, and if so, how should branches be used?<br><br>4.  Is it wiser to fetch than to pull?  I have seen this suggested, but don&#39;t understand the use of fetch.<br>
<br><br>Here is a rough idea of what I think I need to do now.  Please comment on any ommissions or problems:<br><br>At home, on my primarly workstation:<br>1. cd to a directory with a good tree (perhaps ~/org) already under git control.<br>
2. insert the USB drive (I have a label &quot;BLUE&quot; on my usb drive.  On my gnome/ubuntu box, it automounts as /media/BLUE)<br>3. git clone --bare . /media/BLUE/org.git<br>4. git remote add BLUE /media/BLUE/org.git<br>
5. ??  git push BLUE (master?)<br><br>Now at work, I am on the other workstation:<br>1. git clone /media/BLUE/org.git<br>2. can I now do this?: git remote add BLUE /media/BLUE/org.git<br>2. work <br>3. git push BLUE ???<br>
4. <br><br>Back at home<br>1. git fetch BLUE ??  or git pull BLUE ??<br><br><br><br>I am confused at a couple of points here.  <br><br>Much of the above I have gleaned from three posts by Bernt Hansen.  Other sources on line include some postings on the very problem of syncing machines using git.  <br>
<br>Can I pull from /media/BLUE/org.git ?<br><br>Well, perhaps this is enough confusion for now.  Thanks for all the suggestions on this list.  I think it&#39;s going to work, and I&#39;ll expand this to other directories as well.<br>
<br>Alan <br><br><br>-- <br>Alan Davis<br><br>It is undesirable to believe a proposition when <br>there is no ground whatsoever for supposing it is true.<br>     ---- Bertrand Russell <br>They are ill discoverers that think there is no land, when they can see nothing but sea.<br>
     ----   Sir Francis Bacon<br><br>