[git-users] Re: git grief
I suppose its a system difference issue try: git config core.filemode false and then git status again 16 януари 2013, сряда, 02:07:54 UTC+2, JavaSrvcs написа: 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 Please, commit your changes or stash them before you can merge. Aborting -- I HAVE NOT CHANGED THIS FILE. It is telling me that my local changes huh? I have not changed or modified the file. When I do a $git status I see a lot of other files that begin with: *# modified: /Some.java* many lines like the above How do I get out of this mess? I do not want to reset head. I want to get back to the state where it does not think I have modified a specific set of files... namely the files that I did not change. How did I get into this state? How do I prevent from getting into this state in the future? How do I get out of this state now? thanks for all the help. J.V. --
[git-users] Delete sub-folder in GIT
Hello, Complete beginner here! I installed Git, the other day, and in the process of learning how to work with the commands I forked a repo to an already existing one as a sub folder, what I really wanted to do was have it as an independent folder, I do not know how to revert this or delete the sub folder so that I can do the process properly again. I had made some research; used git rm to remove files in the sub folder, so that its empty, but I am doubtful that this is the proper way to do it, to be honest I really have no clue at the moment. Much appreciation to anyone that replies, Thanks. --
Re: [git-users] how do I edit this particular web page...
Perhaps here: http://git-scm.com/course/svn.html ? If you want to actually save the HTML of the web page, then (depending on browser), I click on the Save page as ..., or do an Cntl-S (control S). On Wed, Jan 16, 2013 at 10:52 AM, Roger Pack rogerpack2...@gmail.com wrote: I see this web page: http://git.or.cz/course/svn.html has some broken links, etc. (even the link that says this is unmaintained, go here now! is broken). But I don't see how to edit it and submit a pull request (seems absent from https://github.com/github/gitscm-next which the rest of the site uses)? The email at the bottom bounces, as well. Any ideas here? -roger- -- -- Maranatha! John McKown --
Re: [git-users] how do I edit this particular web page...
Hmm...yeah that helps thanks! Any ideas on how I could actually be able to submit a pull request to modify the original (now broken) web page to point to the right place? just wondering. Thanks. =roger On Wed, Jan 16, 2013 at 9:59 AM, John McKown john.archie.mck...@gmail.comwrote: Perhaps here: http://git-scm.com/course/svn.html ? If you want to actually save the HTML of the web page, then (depending on browser), I click on the Save page as ..., or do an Cntl-S (control S). On Wed, Jan 16, 2013 at 10:52 AM, Roger Pack rogerpack2...@gmail.com wrote: I see this web page: http://git.or.cz/course/svn.html has some broken links, etc. (even the link that says this is unmaintained, go here now! is broken). But I don't see how to edit it and submit a pull request (seems absent from https://github.com/github/gitscm-next which the rest of the site uses)? The email at the bottom bounces, as well. Any ideas here? -roger- -- -- Maranatha! John McKown -- --
[git-users] Re: What is best practice to manage a set of repos?
Thanks, I'll take a look. I do need to be able to work on Windows too, but my needs are pretty simple... 99% of the time, the only group action I'll need is to check out all the latest files of all projects. On Monday, January 14, 2013 4:14:41 PM UTC+2, Thomas Ferris Nicolaisen wrote: We've been using gitslave http://gitslave.sourceforge.net/ for this purpose with some great experiences. Note that it's somewhat untested on Windows though. --
[git-users] Re: Delete sub-folder in GIT
Thanks I Untracked all files in the directory with git rm -r --cached path to folder and then deleted the empty directory from PC On Wednesday, 16 January 2013 12:57:55 UTC, Victoria wrote: Hello, Complete beginner here! I installed Git, the other day, and in the process of learning how to work with the commands I forked a repo to an already existing one as a sub folder, what I really wanted to do was have it as an independent folder, I do not know how to revert this or delete the sub folder so that I can do the process properly again. I had made some research; used git rm to remove files in the sub folder, so that its empty, but I am doubtful that this is the proper way to do it, to be honest I really have no clue at the moment. Much appreciation to anyone that replies, Thanks. --
