Hmm...you might need to add "git remote update" in there. git pull does
that by default.
On Mon, Aug 19, 2013 at 1:22 PM, me 1 wrote:
>
> On Sun, Aug 18, 2013 at 9:04 PM, me 1 wrote:
>>
>>> On Sunday, August 18, 2013 6:13:38 PM UTC-4, Jim Toth wrote:
>&
On Sun, Aug 18, 2013 at 9:04 PM, me 1 wrote:
> On Sunday, August 18, 2013 6:13:38 PM UTC-4, Jim Toth wrote:
>>
>> There are a few ways to go; probably the best way is to set up a bare
>> repository that you push and pull from in both places, but I'd probably add
>>
pment/directory
git merge --ff-only devel/master
(--ff-only because I'm paranoid -- that will give you the same sort of
warnings that "git push" would give you if you the trees had diverged).
-- Jim Toth
On Sun, Aug 18, 2013 at 2:36 PM, me 1 wrote:
> On Sunday, August 18, 2013
As I recall, if the config.ru itself isn't owned by the puppet user, we'll
get similar errors from Passenger (spewing out an HTML error page, which
the agents then unhelpfully log).
It might be something else -- given that it's HTML, you might want to just
go to https://:8140 in a browser and s
