How to manage WordPress themes or plugins with Git as part of a bigger repository?

In my repository, I have multiple folders with different stuff, say: /HTML /Scripts /WordPress /Themes /redTheme /blueTheme /greenTheme I have a local WordPress installation, with the standard structure: /MyDevSite /wp-admin /wp-content /plugins /themes What I need, is to directly checkout the folders redTheme, blueTheme and greenTheme into the folder /MyDevSite/wp-content/themes, edit them there, and check […]

Fail in installing libcurl4-gnutls-dev in AWS ubuntu

I try to do the following install (in order to upgrade git) $sudo apt-get install libcurl4-gnutls-dev and i get these errors: After this operation, 13.6 MB of additional disk space will be used. Do you want to continue [Y/n]? y Err http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ natty-updates/main libtasn1-3 amd64 2.7-1ubuntu1.1 403 Forbidden Err http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ natty-updates/main libgnutls26 amd64 2.8.6-1ubuntu2.1 403 […]

Re: git merge when two different versions of file

I have a different version of a file in a development branch than I do in the master. The problem is I want to track those files, so how do I merge development into master without overwriting that file?

Handle a same codebase, different app versions in git

I developed a general application, because I need to create some very similar app. I tried to separate the differences, so I have a settings.xml. But it’s not enough because sometimes I need to change the code in a version, but I really want to have a same codebase for every app. I want to […]

Jenkins-git cloning failing with Couldn't resolve host 'gitserver.us.manh.com' while accessing http://

I am trying to clone a git repo from Jenkins, which is failing with below exception (if I try manually it works fine), I am using http (not https). stderr: error: Couldn’t resolve host ‘atlgit-01.us.manh.com’ while accessing http://svadlamudi:Manh6999@atlgit-01.us.manh.com:7990/scm/rndwmar/te.git/info/refs?service=git-upload-pack fatal: HTTP request failed repo url:http://Svadlamudi@atlgit-01.us.manh.com:7990/scm/rndwmar/test.git I am using GIT plug-in 2.0, Git client plug-in 1.4.6 and […]

How to configure Teamcity git plugin to init submodules NON-recursively

According to its repo git-plugin has such functionality (http://git.jetbrains.org/?p=teamcity/git-plugin.git;a=commit;h=b2354dbef90b793d7e24c6f3c135f7a0bec4ad15) I’m wondering is there a way to disable recursive submodules (fetch only first-level submodules) via Teamcity web UI? Or is there any other way to workaround this cause I need it for my current project. *This question is mirrored in http://devnet.jetbrains.com/message/5500243

GitHub Undo a (not most recent) Merge

I have a master branch that looks like this: A-B- C -D-E-F \ / H-I Where H and I are commits to the same branch made by another developer, and D is the commit from merging I and C. I want to remove all code from the commits H and I. I essentially want the […]

In Jenkins, git fetch is very slow, 11 seconds every time

In Jenkins, when I have a windows batch script call git fetch, it takes 11 seconds every time. This happens even if I have just called the same script and waited 11 seconds to fetch the same repo. The same thing happens if I use the Git plugin when it updates the code at the […]

Ruby on Rails – 404 response – “The page you were looking for doesn't exit”

I’ve been stuck on this error of “The page you were looking for doesn’t exit” for a while now. Does anyone know how to solve it? GEMFILE source ‘https://rubygems.org’ gem ‘heroku’, ‘3.0.1’ # Bundle edge Rails instead: gem ‘rails’, github: ‘rails/rails’ gem ‘rails’, ‘4.0.0’ # Use sqlite3 as the database for Active Record group :development […]

Unable to push to git repository on my server

I want to have two git repositories on my server. One of them belongs to someone else. I copy their ssh keys onto my account: sudo cp /home/otheruser/.ssh/id_rsa id_rsa sudo cp /home/otheruser/.ssh/id_rsa.pub id_rsa.pub git clone git@github.com:otheruser/Gateway.git git remote show origin * remote origin Fetch URL: git@github.com:otheruser/Gateway.git Push URL: git@github.com:otheruser/Gateway.git HEAD branch: master Remote branches: … […]

Git Baby is a git and github fan, let's start git clone.