[git-users] Re: Questions about pushing local branch to another (file based) branch
On Tuesday, December 5, 2017 at 9:14:58 AM UTC-6, Philippe Godfrin wrote: > > Folks, > Forgive my noobyness. What I am doing to learn Git is I have a 'central > repo' (which is not really a central) as a directory structure on a hared > network drive (windows H: drive). I have Git and Giteye installed. The repo > on the H: drive looks like this: > > Directory: H:\DBA_PROD\mssql > > ModeLastWriteTime Length Name > - -- > d- 11/30/2017 11:05 AMprocs > d- 11/30/2017 10:12 AMsql > > > I added an empty repo and then made a PROD branch. Added files to the prod > branch, committed the files. then I checked out a devel branch. Then I > cloned the devel branch to my local drive. I've added and deleted files > from the local branch. Now I want to get the local devel branch to the > 'remote' devel branch (on the H: drive). I'm using Giteye as opposed to git > commands... > Push upstream didn't work - seems to come back OK, but the deleted files > don't get deleted (on the H: drive, and the new files don't appear). Merge > makes the local and 'remote' history appear the same, but yest the files > have not been changed. > Clearly I have no idea what I'm doing (which is why I'm trying to > learn...). > anyone, please help? > much thanks, > phil > > OK Folks, I think I figured it out. the order has to be just right (naturally). I've created a master, prod and devel repo on the network, cloned local copies, pushed up changes through prod and into master. Now I need to document it. Thanks! pg -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Questions about pushing local branch to another (file based) branch
On Tuesday, December 5, 2017 at 9:56:59 AM UTC-6, Konstantin Khomoutov wrote: > > On Tue, Dec 05, 2017 at 07:14:58AM -0800, Philippe Godfrin wrote: > > > Forgive my noobyness. What I am doing to learn Git is I have a 'central > > repo' (which is not really a central) as a directory structure on a > hared > > network drive (windows H: drive). I have Git and Giteye installed. The > repo > > on the H: drive looks like this: > > > > Directory: H:\DBA_PROD\mssql > > > > ModeLastWriteTime Length Name > > - -- > > d- 11/30/2017 11:05 AMprocs > > d- 11/30/2017 10:12 AMsql > > > > For a start, could you elaborate on how did you make that directory > "a repo"? > > Have you run something like > > git init H:\DBA_PROD > > ? > > The reason I'm asking is that I find the wording "I have a … repo … > as a directory structure" to be strange: a Git repo is not something you > have "as a directory structure" — it rather is a directory with contents > you typically have no business about since it's managed by Git. > > So let's clear this up first. > Much appreciate the response, this is all somewhat new to me. I am pretty sure I ran the init commands on the subdirectory (shoot I shouldn't have snipped out the git stuff): PS H:\DBA_PROD\mssql> dir Directory: H:\DBA_PROD\mssql ModeLastWriteTime Length Name - -- d- 11/30/2017 10:24 AMdba d-12/5/2017 9:06 AMprocs d- 11/30/2017 10:12 AMsql -a 11/30/2017 10:30 AM 10 .gitignore -a 11/30/2017 10:30 AM209 .project Here's a current status: xxx@TESTPLT145 MINGW32 /h/DBA_PROD/mssql (DEVEL-1-1-0) $ git status On branch DEVEL-1-1-0 Changes to be committed: (use "git reset HEAD ..." to unstage) deleted:procs/dba_bkp_db.sql modified: procs/dba_full_bkp_all_db.sql new file: procs/full_bkp_current_db.sql renamed:procs/dba_full_bkp_sys_db.sql -> procs/full_bkp_sys_db.sql modified: procs/tsql-stub.sql deleted:sql/add-backup-dev.sql deleted:sql/check-version.cmd deleted:sql/create-dbautil.sql deleted:sql/msdb-recovery-full.sql deleted:sql/post-install-report.cmd deleted:sql/post-install-validate.sql deleted:sql/prince-mssql2016-hardening.sql deleted:sql/run-prince-hardening.cmd deleted:sql/set-dba.sql deleted:sql/set-sa.sql deleted:sql/set-server-config.sql xxx@TESTPLT145 MINGW32 /h/DBA_PROD/mssql (DEVEL-1-1-0) $ -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Questions about pushing local branch to another (file based) branch
Folks, Forgive my noobyness. What I am doing to learn Git is I have a 'central repo' (which is not really a central) as a directory structure on a hared network drive (windows H: drive). I have Git and Giteye installed. The repo on the H: drive looks like this: Directory: H:\DBA_PROD\mssql ModeLastWriteTime Length Name - -- d- 11/30/2017 11:05 AMprocs d- 11/30/2017 10:12 AMsql I added an empty repo and then made a PROD branch. Added files to the prod branch, committed the files. then I checked out a devel branch. Then I cloned the devel branch to my local drive. I've added and deleted files from the local branch. Now I want to get the local devel branch to the 'remote' devel branch (on the H: drive). I'm using Giteye as opposed to git commands... Push upstream didn't work - seems to come back OK, but the deleted files don't get deleted (on the H: drive, and the new files don't appear). Merge makes the local and 'remote' history appear the same, but yest the files have not been changed. Clearly I have no idea what I'm doing (which is why I'm trying to learn...). anyone, please help? much thanks, phil -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
