Boyd Lynn Gerber wrote:
>On Thu, 22 Jan 2009, Stephen R. van den Berg wrote:
>>Boyd Lynn Gerber wrote:
>>>>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
>>>CONFLICT (content): Merge conflict in server/base_server/roxen.pike
>>>Automatic merge failed; fix conflicts and then commit the result.
>I have a cron job that runs at 1:00 AM MST every day that does the
>following.
I run my sync with CVS at 06:00 every day CET. I presume that 1:00 MST is
an hour after that?
>$ cd /master/git/roxen/
>$ git pull
I suggest you use git fetch instead.
git pull tries to automerge with the checked out active branch
on your local repo and is responsible for the merge-conflicts.
>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.
Sounds excellent.
>I use your roxen as our main copy of all roxen. I do sometime update
That should be fine.
>/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.
Still, git pull tries to merge the checked out branch.
Maybe making the clone at your end bare solves it, but fetch is cleaner
than pull anyway.
--
Sincerely,
Stephen R. van den Berg.
"Beware: In C++, your friends can see your privates!"
|