[git-users] Deploying git master to a live server

I am a beginner and have successfully setup git to track code, push to origin (gitlab) and push to my live server (a replicated version for testing) In my replicated version, I created a brand new empty subdomain then configured git to push to live [git push live master] and it worked

[git-users] How to make git work!

git is doing my head in. I started using it thinking it would help but it just seems to add extra time and headache to projects that wasn't there before. Almost every time I try to update a repo, I get an error that confueses the hell out of me... I have come to the conclusion that I am

[git-users] Re: How to make git work!

Cant edit post. Here is the commit log - i was expecting/hoping for a single commit - instead I have 4 $ git log commit 0988bf8f5a165a6e213982cfcf0733ccb3452101 Author: XXX Date: Tue May 5 12:00:28 2020 +1000 Trying to fix the merge issues that were created from commit

[git-users] Git keeps getting out of sync and I cant figure it out

I keep trying to learn and use git but I keep screwing up my work - overwriting changes and creating duplicate efforts. I made some changes today, but was on the wrong branch - when trying to change branch I screwed up I made the changes again and then tried to push to master and I get this:

[git-users] Re: Git keeps getting out of sync and I cant figure it out

Ok, I just went ahead and did a pull... It shows me the changes... I realised that on Friday I modified the README.md... It's way too hard to keep up... I think git is too complicated for me... thanks anyway On Monday, 27 April 2020 12:48:22 UTC+10, SJW wrote: > > I keep trying to learn a

[git-users] Git completely thrown a curveball now...

I have my `master` I created a branch `aftersales` Today I finalised `aftersales` and commenced a merge. There were a few conflicts which I worked through and fixed, committed and finished merge. When I published to my staging server, it wasn't working so I went back and checked the code...

[git-users] Re: How to make git work!

Thanks Philip. I have that mental model right. I get that bit, and for the most part, I can make basic updates and copy them to the server. I even incorporated my stating server as another remote where I would push to when something was ready for viewing but I didn't like the process and

[git-users] Git workflow recommendations

New to Git and I'm using a basic workflow that I'm not sure is that good so wanted to post it here for feedback, critique and suggestions if possible. Dev = Local Win 7 PC Staging = Staging Server Production = Live Site 1. Develop on a branch (new-feature) 2. Add, Commit, Push to

[git-users] Re: Git completely thrown a curveball now...

I think I know what happened now after analysis. I followed the message I received when I pushed the branch to origin: remote: remote: To create a merge request for payment-gateway, visit: remote: https://gitlab.com/SJW/absee/-/merge_requests/new?merge_request%5Bsource_branch%5D=aftersales

Re: [git-users] Git workflow recommendations

On Thursday, 14 May 2020 15:54:31 UTC+10, Magnus Therning wrote: > > > SJW > writes: > > > New to Git and I'm using a basic workflow that I'm not sure is that good > so > > wanted to post it here for feedback, critique and suggestions if > possible. > >

[git-users] Trying to decipher what happened to git history

I had an issue which I am not sure how I got there (code modified and then reverted in a later revision) As I am not 100% sure if it is expected behaviour by git or something else happened, I just wanted to see if anyone here could enlighten me? I branched out master (feature-1) and made some

[git-users] How to track changes to db

I am trying to find a good way to track changes to the db but havn't got it down pat yet. What I am doing ``` git branch feature git checkout feature ``` modify code and add/modify database tables ... create a txt file called feature.txt and list changes. e.g. DB ALTER statements etc. that I

Re: [git-users] How to track changes to db

I'm not sure I understand exactly what it is you are talling about -- 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

Re: [git-users] How to track changes to db

On Wednesday, 5 August 2020 at 23:15:49 UTC+10 rhkr...@gmail.com wrote: > On Tuesday, August 04, 2020 10:34:59 PM SJW wrote: > > I am trying to find a good way to track changes to the db but havn't got > it > > down pat yet. > > > > What I am doing > &

Re: [git-users] How to track changes to db

On Thursday, 6 August 2020 at 06:59:28 UTC+10 Magnus Therning wrote: > > SJW writes: > > > I'm not sure I understand exactly what it is you are talling about > > As I mentioned, I'm not sure I understand your question... anyway, it > might be worthwhile looki

Re: [git-users] How to track changes to db

them or not at all or just separate them but > somehow link them together with the repo? what's the purpose of these > files? > > Best, > s > > On Wed, Aug 5, 2020, 13:02 SJW wrote: > >> I'm not sure I understand exactly what it is you are talling about &g

[git-users] How to effectively use git

I am still trying to get my head around the best possible way to use git (and failing) Here is my normal process below - but I don't like it because it is very difficult to manage repos and versions. Hoping someone can read this and advise me on improvements or tell me that this is just how

[git-users] Re: How to effectively use git

happen because you aren't using the tool's (Git) strengths (cheap easy > branching!). Avoid mixing tools (hammers, screwdrivers vs screws and nails) > Would love to be in a position where I trust git enough to be able to do this. > > Philip > > On Monday, July 6, 2020 at 2:28:01 AM

Re: [git-users] How to effectively use git

On Monday, 6 July 2020 22:22:49 UTC+10, Magnus Therning wrote: > > > SJW > writes: > > > I am still trying to get my head around the best possible way to use git > > (and failing) > > > > Here is my normal process below - but I don't like it because it

Re: [git-users] How to effectively use git

ploy to stating server On Thursday, 9 July 2020 07:15:40 UTC+10, Magnus Therning wrote: > > > SJW > writes: > > > On Monday, 6 July 2020 22:22:49 UTC+10, Magnus Therning wrote: > >> > >> > >> SJW > writes: > >> > &

Re: [git-users] Screwed up merge - wrong branch - now I'm lost

ghts sleep - in the heat of the moment, when all that is running through head is "Oh Sh**... F*** , F***, F***, F***, F***" ... not so simple to comprehend as a beginner... Thanks On Saturday, 25 July 2020 at 10:43:27 UTC+10 Michael Gersten wrote: > > On 2020-07-24, at 1:26 AM, SJW w

[git-users] Trying to get git to play with a remote bare repo

I set up a remote git repo on my server for staging. Added a remote on local Created a new branch 'staging' Went to push staging repo to staging remote and got: remote: fatal: You are on a branch yet to be born So I googled and got the solution - I connected to the remote server and changed

Re: [git-users] Trying to get git to play with a remote bare repo

>> Please refrain from such whining. >> First, is that you're venting on a communication venue which is used by >> unpaid folks to help other folks solve their problems with using Git. Please refrain from whining? And then you go on to whine about my post ... pot meet the kettle. I didn't

[git-users] Screwed up merge - wrong branch - now I'm lost

1. master - stable base code 2. staging - code published on staging currently being tested 3. payments - a feature branch I was developing on. I was working on some final touches to payments: $ git add classes/class.payment.invoice.php invoice-prepare.php $ git commit -m 'Added rand query

[git-users] git amend wont merge

I had a bug in my code so I branched master to `bugfix-333` and I added a `var_dump();` in the code to debug. I then found the problem, fixed it, committed and merged `bugfix-333` into `staging` branch. I then realised that I'd left the `var_dump();` in the code so i checked out the

[git-users] Change management practices

I have been Watching YouTube tutorials in order to expand my knowledge in git but there are now some questions that this has raised so I was hoping someone here could educate me on some best practices or philosophies I should consider. The main point is around rebase - I see great value in

Re: [git-users] Change management practices

wrote: > On Sun, Aug 29, 2021 at 3:51 AM SJW wrote: > >> I will regularly create feature branches for each new enhancement or fix. >> The problem rears its head when testing is delayed and the first feature >> (feature-branch-1) is still not approved for production

Re: [git-users] Change management practices

rs in the pie who aren't > coders/devs). Is it a run fast and break things shop, or a steady as she > goes, no icebergs shop? > On Tuesday, August 31, 2021 at 12:09:06 AM UTC+1 SJW wrote: > >> Thanks to both of you for providing such detailed, in-depth responses. >> >> Y

[git-users] git --amend doesn't seem to work as I anticipated

I have been working on a feature-branch - made a few commits and ready for testing. I `git checkout staging` branch, merge in feature-branch and then push it to the staging server. While testing in staging I realise I have left some logging on or something else minor. I checkout

[git-users] Re: git --amend doesn't seem to work as I anticipated

ns!), but it's documentation is > horrendous/next to useless, despite it being real magic [sufficiently > advanced technology] > On Thursday, September 2, 2021 at 12:21:06 AM UTC+1 SJW wrote: > >> I have been working on a feature-branch - made a few commits and ready >> for te

[git-users] Git keeps deleting files

This issue has occurred 4 times with the last 4 commits and I have no idea how to stop it and it is becoming increasingly frustrating. Composer files are being deleted from within my project within */vendor/composer* Each time I merge a branch, I go to check the application and get an error:

Re: [git-users] Updates were rejected because the tip of your current branch is behind its remote counterpart.

On Thursday, 31 August 2023 at 18:49:35 UTC+10 mag...@therning.org wrote: What you are trying to do is to rewrite history on the central git repo. While git allows doing that, it does require you to signal that you are completely sure you know what you are doing. Look at '--force' and

[git-users] Updates were rejected because the tip of your current branch is behind its remote counterpart.

I have a `*master*` branch which is in sync with our LIVE site I have a `*staging*` branch which was in sync with our STAGING site I created a new branch `*feature-branch*`, made some changes and merged it into `*staging*` branch for testing We have decided that we don't want these changes. So