On Tue, Jan 15, 2013 at 04:07:54PM -0800, JavaSrvcs wrote:
I have not changed any code and just tried to do a git pull and get the
following message:
Updating 527f1ee..18cf73e
error: Your local changes to the following files would be overwritten by
merge:
java//Info.java
On Wed, Jan 09, 2013 at 06:03:40PM -0600, Ryan Hodson wrote:
I wrote a Git book awhile ago, and I've recently released the entire
thing for free at http://rypress.com/tutorials/git/index.html. It
covers a lot of the basic concepts that beginners ask about on this
list, so I thought it would
On Sun, 18 Nov 2012, Cesar Casasola wrote:
Now I can't to access to tree complety. I have this for the moment
$ git log --graph --oneline --decorate --all
* 9d62a1f (HEAD, master) -Actualizacion de .gitignore
* d4392db Actualizacion de .gitignore para no incluri los archivos del tipo
.db
*
On Fri, 16 Nov 2012, Mario wrote:
@ Iñigo:
I meant something like the following:
git mv folder1/filename1 filename2
and in the same moment have changes in the code like:
import folder1.filename1 -- import filename2
from folder1 import filename1 -- import filename2
import filename1
On Fri, 16 Nov 2012, Konstantin Khomoutov wrote:
On Fri, Nov 16, 2012 at 12:05:58PM +0530, Ankita Poovaiah wrote:
I have created ssh keys. While trying to push git repository to github it
is showing this error git push -u origin master
fatal: unable to connect to github.com:
github.com:
I'm not sure I understand this right. Do you mean change the references to
imports on python files or git references?
iñ
On Fri, 16 Nov 2012, Mario wrote:
I am currently totally rearranging a python project, which mainly means
changing file names and moving folders and files. Therefore I
I'd create a bare repository from active one and then copy it on remote. So:
$ cd ~/projects/repo
$ git clone --bare .git ../repo.git
$ cd ../
$ scp -r repo.git user@host://path
From there, you could then add such bare repo to your active repo as a source.
So.
$git remote add origin
I never bothered to learn what these numbers precisely mean (because
this is utterly low-level info)
I think so too. But anyway your explanation was quite useful to understand
the way
git manages its files and states. :)
iñ
--
-
imed...@grosshat.com
es un
Hi David,
did you try with git commit -a?
iñ
I have some staged files:
[dor...@localhost VTK-GraphColors]$ git status
# On branch VTK-GraphColors
# Changes to be committed:
# (use git reset HEAD file... to unstage)
#
# modified: Infovis/vtkApplyColors.cxx
# modified:
