[Cialug] git in structured environment

[Colin Burnett]

On Wed, Jul 9, 2008 at 3:44 PM, Lathrop Preston <lathrop at prestonfam.org> wrote:
> umm... no...
>
> if you are doing the git equiv of an 'svn update' to the working copy all
> you will be doing is getting the most current code from the repository.
>
> Think of it as an anonymous read-only checkout.

Could you be more pedantic in your scenario?

You originally suggested to crontab to a "working copy under backup".
To me that means my workstation is periodically executing `git push
myserver` where myserver is a remote repo setup in .git/config.  If
this is the case you have in mind then if a change I made creates an
unresolvable conflict (e.g., modification of the exact same line) then
my cron'ed `git push` cannot resolve my conflict and my pushes fail.

The only other way I can interpret your comment is that my server has
a crontab to `git pull` from all the workstations.  Again, the git
pull could hit an unresolvable conflict and the pulls fail.


Colin