On Thu, 22 Jan 2009, Stephen R. van den Berg wrote:
Boyd Lynn Gerber wrote:
>git-roxen
>>From git://git.cuci.nl/roxen
> 081a4c8..888c097 5.0 -> origin/5.0
> + a5f8d24...e835622 BuGless -> origin/BuGless (forced update)
> * [new branch] BuGless.mast4 -> origin/BuGless.mast4
> 081a4c8..888c097 master -> origin/master
>Auto-merged server/base_server/prototypes.pike
>Auto-merged server/base_server/roxen.pike
>CONFLICT (content): Merge conflict in server/base_server/roxen.pike
>Auto-merged server/base_server/roxenloader.pike
>Auto-merged server/etc/modules/Roxen.pmod
>Auto-merged server/modules/database/sqltag.pike
>Auto-merged server/modules/tags/rxmltags.pike
>Auto-merged server/protocols/http.pike
>Automatic merge failed; fix conflicts and then commit the result.
Seems that you are doing a pull somewhere, and are trying to automerge
one of the branches here with your currently checked out branch (which is?).
I have a cron job that runs at 1:00 AM MST every day that does the
following.
$ cd /master/git/roxen/
$ git pull
I wanted to keep a local git master copy of roxen for when I or someone in
my company make changes, we are able to feed the back to the main project.
Our company has standardized on git.
I am the one that feeds all the changes back to the various projects. We
have the followin setup
/master/git/
/master/svn/
/master/cvs/
/master/hg/
...
The above have daily scripts that run that try and keep our master
up to date with all the projects we track.
We have a coresponding /working/... where all our code is worked on. I
compare and feed ourchanges back to the various projects
Everything in /master is our local version of the various projects. We
try to use what ever source code control system the project uses to keep
our local copy identical to the original project.
I use your roxen as our main copy of all roxen. I do sometime update
/master/cvs/roxen/, but I defer to your git repo for roxen. I did a fresh
clone of your repo and last night at 1:00 AM MST my script tried to sync
with it.
Thanks,
--
Boyd Gerber <[email protected]> 801 849-0213
ZENEZ 1042 East Fort Union #135, Midvale Utah 84047
