Posted
by Marijn Huizendveld
on Stack Overflow
See other posts from Stack Overflow
or by Marijn Huizendveld
Published on 2010-05-08T22:47:16Z
Indexed on
2010/05/08
22:48 UTC
Read the original article
Hit count: 185
I'm having trouble merging two branches with Gity. When I do a checkout on my master branch and click: "Merge into master" nothing seems to happen...
Any thoughts?
© Stack Overflow or respective owner
as seen on Stack Overflow
- Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server.
My cent 6.3 vm gets a 401 error
git clone https://git.acme.com/git/torque-setup
"error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs
As a work…
>>> More
as seen on Ask Ubuntu
- Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop:
http://git-scm.com/download/linux
When I do:
$ sudo apt-get install git-core
This is what my terinal shows:
Reading package lists... Done Building dependency tree Reading
state information... Done The following packages…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn).
svn support works well, but I have some trouble with git.
Actual configuration:
CentOS 5
Apache 2.2.8
Git 1.7.4.1
The /etc/httpd/conf/httpd.conf content:
ServerTokens OS
ServerRoot "/etc/httpd"
PidFile run/httpd…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S).
I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference).
I have searched the whole afternoon and I think I'm stuck.
I have think I have understood that nginx needs fcgiwrap…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I…
>>> More
as seen on Super User
- Search for 'Super User'
Hi,
I was using MacOSX 10.5 on my MacBook until today and I had 4GB of memory there.
Now I have updated to MacOSX 10.6 and it only displays 3GB.
Why is that? How can I fix it?
Also, I am a bit wondering why most people (well, most of the Google hits explained the 3GB issue that way -- leaving…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
Hi everyone,
I want to upgrade my php version running on MAMP to 5.3.
I've copied the ./configure statement from phpinfo() and downloaded the 5.3 branch source i wish to compile.
However, when i try to compile it i get an error about a missing config_vars.mk file from apxs.
How can i solve this…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I get this error while trying to compile Asterisk 1.6.2 on Snow Leopard Server :
ld: symbol dyld_stub_binding_helper not defined
(usually in crt1.o/dylib1.o/bundle1.o)
Googling this I’ve found nothing enlightening so far.
This is what I am trying:
./configure --without-h323 --without-zaptel…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
OK so I have # -*- coding: utf-8 -*- at the top of my script and it worked for being able to pull data from the database that had funny chars(Ñ ,Õ,é,—,–,’,…) in it and store that data into variables...but I have run into other problems, see I pull my data, organize it, and then dump it into a variables…
>>> More
as seen on Super User
- Search for 'Super User'
I am trying to install a Python library in the Presto package, source http://www.cv.nrao.edu/~sransom/presto/
Using 'gmake fftfit' I get the following error:
cd fftfit_src ; f2py-2.7 -c fftfit.pyf *.f
running build
running config_cc
unifing config_cc, config, build_clib, build_ext, build commands…
>>> More
