I am sorry. I did not realize that I as being unclear in my comments. <br><br>To me a working copy is always checked out/updated from the repository, not from multiple other locations<br><br>in other words<br>each user will perform commits to the repository as is normal. resolving any conflicts that might arise at that time.<br>
on the backup server there is a job that grabs the most recent revision of any updated files right before the backup is performed<br><br>Some of this might be a difference in how git works compared to how other source control systems (ie CVS, SVN, SourceSafe [shudder])<br>
as I said in my first post I might have been missing something specific to the situation.<br><br>Laith<br>(not feeling very pedantic)<br><br><div class="gmail_quote">On Wed, Jul 9, 2008 at 4:07 PM, Colin Burnett <<a href="mailto:cmlburnett@gmail.com">cmlburnett@gmail.com</a>> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="Ih2E3d">On Wed, Jul 9, 2008 at 3:44 PM, Lathrop Preston <<a href="mailto:lathrop@prestonfam.org">lathrop@prestonfam.org</a>> wrote:<br>
> umm... no...<br>
><br>
> if you are doing the git equiv of an 'svn update' to the working copy all<br>
> you will be doing is getting the most current code from the repository.<br>
><br>
> Think of it as an anonymous read-only checkout.<br>
<br>
</div>Could you be more pedantic in your scenario?<br>
<br>
You originally suggested to crontab to a "working copy under backup".<br>
To me that means my workstation is periodically executing `git push<br>
myserver` where myserver is a remote repo setup in .git/config. If<br>
this is the case you have in mind then if a change I made creates an<br>
unresolvable conflict (e.g., modification of the exact same line) then<br>
my cron'ed `git push` cannot resolve my conflict and my pushes fail.<br>
<br>
The only other way I can interpret your comment is that my server has<br>
a crontab to `git pull` from all the workstations. Again, the git<br>
pull could hit an unresolvable conflict and the pulls fail.<br>
<font color="#888888"><br>
<br>
Colin<br>
</font><div><div></div><div class="Wj3C7c">_______________________________________________<br>
Cialug mailing list<br>
<a href="mailto:Cialug@cialug.org">Cialug@cialug.org</a><br>
<a href="http://cialug.org/mailman/listinfo/cialug" target="_blank">http://cialug.org/mailman/listinfo/cialug</a><br>
</div></div></blockquote></div><br>