[git-users] Disappearing Config Files
I have files I move around between several different environments, and in each environment I have a config file (web.config) that is unique to each environment. I make changes on my machine, push them to a repository, move to a development machine and pull them from the repository, then move them to to a test machine and pull them from the repository, etc. Through some trial and error I figured out that most of the time if I put my web.config into my .gitignore file everything works fine, but not always. Right now I'm spending my afternoon trying to figure out why whenever I checkout the master branch it deletes my web.config file. It happens like this. I will have my web.config file in my directory and then checkout a branch into that directory (e.g. git checkout new-search) and everything is fine. If I switch to another branch (e.g. git checkout fix-search) everything is fine as well. But when I check out the master branch (e.g. git checkout master) it deletes my web.config file. Why is it deleting my config file and more importantly, how can I get it to stop doing that so that I can spend my time working on code and not fussing with git? Thanks! -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/NbsCC-lIzd8J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Disappearing Config Files
That was it. I tried several times to delete it from fix-search, thought I had it a couple of times, but it was still there. When I finally succeeded in deleting it, and then re-added it it seems to be sticking around when I switch between the branches. Thanks! On Wednesday, October 3, 2012 4:13:25 PM UTC-7, Peter J Weisberg wrote: On Wed, Oct 3, 2012 at 3:54 PM, Jeffery Brewer jeffery...@gmail.comjavascript: wrote: I have files I move around between several different environments, and in each environment I have a config file (web.config) that is unique to each environment. I make changes on my machine, push them to a repository, move to a development machine and pull them from the repository, then move them to to a test machine and pull them from the repository, etc. Through some trial and error I figured out that most of the time if I put my web.config into my .gitignore file everything works fine, but not always. Right now I'm spending my afternoon trying to figure out why whenever I checkout the master branch it deletes my web.config file. It happens like this. I will have my web.config file in my directory and then checkout a branch into that directory (e.g. git checkout new-search) and everything is fine. If I switch to another branch (e.g. git checkout fix-search) everything is fine as well. But when I check out the master branch (e.g. git checkout master) it deletes my web.config file. Why is it deleting my config file and more importantly, how can I get it to stop doing that so that I can spend my time working on code and not fussing with git? My guess is that web.config is committed in the fix-search branch. When you switch to fix-search, that version of web.config is written to the working tree (overwriting the file that was there, which was ignored and therefore uninteresting, so Git didn't bother to tell you about it). Then when you switch from fix-search to master, Git checks to see if web.config in the working tree is the same as it is in fix-search. If so, then there are no changes to deal with when switching branches, and it can be safely updated to its 'master' state (nonexistent). -PJ Gehm's Corollary to Clark's Law: Any technology distinguishable from magic is insufficiently advanced. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/_IcOHVjEGvwJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Beginner stuck in a commit
Thanks very much for all the help. I'm going to play around with this tomorrow when I get back on the computer all that is on. On Tuesday, August 7, 2012 8:46:07 AM UTC-7, Peter J Weisberg wrote: On Mon, Aug 6, 2012 at 9:03 PM, Daniel P. Wright wrote: The default editor for git is vim, which is a sensible choice as its available on nearly every platform, but if you've never encountered it before it can seem a little... unusual. I'm not sure a text-editor is sensible if a newbie *can't figure out what it is*. The only reason to make it the default IMO is that it *is*available on every system (except Windows). On Windows, I think a sensible default would be Wordpad. Of course, no one asked me my opinion. :-) P.S.: Here's the minimum you need to know about vim: It starts in command mode To enter text, you need to be in insert mode Switch from command mode to insert mode by pressing i Switch from insert mode to command mode by pressing ESC In command mode: save by typing :w quit by typing :q save and quit by typing :wq quit without saving by typing :q! -PJ Gehm's Corollary to Clark's Law: Any technology distinguishable from magic is insufficiently advanced. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/A2PMxmLnIJoJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Checking out files into existing directory
I swear I'm going to figure out how to work with git at some point and stop bothering everyone with these stupid beginner problems! So here's my current problem. I'm trying to checkout (not sure if that's the right term or not) files from my repository into an existing folder (a folder created as a NetBeans project...something NetBeans recognizes as a project folder). Clone doesn't work...tells me there is existing content. When I deleted all the content and cloned it again, it put all the contents into a sub-folder. So I tried using fetch. When I fetched, it took a very long time and looked like it was doing work (it was showing me some kind of progress), but when it got all done the folder was empty. I tried this a couple of times and then tried pull, which did the same thing. At one point after a fetch I typed git status and got a long message saying all my files were deleted. Finally after searching around for clues decided to clone into a separate directory then copy and paste all the contents of that directory back over to my project directory. I guess my question is, how do I get my files out of the repository and into an existing folder on my computer? And why doesn't fetch or pull actually fetch or pull any files down from the repository? Thanks, -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/-JtXABcSozYJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] New user gets lost driving the Git Bash
Continued thanks for all the help. I'm sorry to be so slow at this...I've just done very little command line operation in the past and probably shouldn't even be allowed near computers at all. I have very little experience on Linux/Unix as well, so I'm really floundering around in the dark here. I learned ls yesterday though, so I'm getting there. So when you say cmd.exe you're talking about just a normal windows command line prompt? Like you go to Start and type cmd? I tried that initially but only got errors (e.g. $ not recognized). Wasn't until I stumbled on the Git Bash thing that I could make Git work at all. I know there are GUI's available, but I have a big desire to develop some command line skills and this seems like a reasonable place to start. I figured how to commit files yesterday! Woo hoo! All that seemed to go reasonably well until I did the diff command, which had me lost until I finally typed h and got the help screen. On Tuesday, July 24, 2012 12:46:44 AM UTC-7, Konstantin Khomoutov wrote: On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. [...] Note that you don't *have to* use Git bash: everything just works in the regular cmd.exe. Actually, the existence of Git bash is due to some parts of Git are written as Unix shell scripts so Git for Windows has to ship with a shell implementing POSIX semantics. There's no consensus in the Git for Windows community on what shell to use for interactive work with Git. I, for one, prefer cmd.exe as I tend to use the shell not only for Git. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/ZTmFPr90CvoJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] First Attempt to Import from SVN Fails
Just tried a test import from SVN and ran into an error: git svn clone --stdlayout svn url returns... Can't locate Git/SVN/Editor.pm in @INC @INC contains: /lib /usr/lib/per15/5.8.8/msys /usr/lib/per15/5.8.8 /usr/lib/per15/site_perl/5.8.8/msys /usr/lig/per15/site_perl/5.8.8 /usr/lib/perl15/site_perl .) at C:\Program Files (x86)\Git/libexec/git-cor\git-svn line 81. BEGIN failed--compilation aborted at C:\Program Files (x86)\Git/libexec/git-core\git-svn line 81. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/WxQCgd6FdDIJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] New user gets lost driving the Git Bash
Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. Was able to set up my configuration settings as described in The Book. Am now at the beginning of Chapter 2 Installing a Repository in an Existing Directory and trying to figure out how to drive the Git Bash over to my existing directory. I tried a dir which in a normal command line gives you a listing of the contents of the current directory, but that's giving me an sh.exe: dir: command not found error. cd seems to work, so I tried a cd c: but not sure I've gone into the root or not. Any way to list files in the Git Bash? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/ORaKXYZbarcJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] New user gets lost driving the Git Bash
Thanks to both... how do you move up one level in the directory structure without having to type the entire path? e.g. cd.. On Monday, July 23, 2012 4:30:14 PM UTC-7, Serge Matveenko wrote: On Tue, Jul 24, 2012 at 3:18 AM, Łukasz Siwiński lsiwin...@gmail.com wrote: Ps: after: $ echo dir alias='ls' .bashrc exit relaunch your prompt (bach/command line) alias dir='ls -Alh' gives more familiar look for windows user personally I use this alias in my linux shell for over 6 years -- Serge Matveenko se...@matveenko.ru http://www.ohloh.net/accounts/lig http://ru.linkedin.com/in/sergematveenko -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/mBcY5sU4qI0J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
