POV-Ray : Newsgroups : povray.off-topic : More Git weirdness Server Time
22 Jun 2024 15:55:55 EDT (-0400)
  More Git weirdness (Message 1 to 3 of 3)  
From: Cousin Ricky
Subject: More Git weirdness
Date: 7 May 2023 15:26:08
Message: <6457fb50$1@news.povray.org>
I have an old file that I want to update, so I created a branch.  I
checkout the branch, and edit the file.  But when I checkout branch
'main', I find that the file is edited there as well!  I do a git
restore on main, and the file is also restored in the branch.  It's as
if there are no branches at all.  What's going on?


Post a reply to this message

From: Cousin Ricky
Subject: Re: More Git weirdness
Date: 8 May 2023 00:51:10
Message: <64587fbe$1@news.povray.org>
On 2023-05-07 15:26 (-4), Cousin Ricky wrote:
> I have an old file that I want to update, so I created a branch.  I
> checkout the branch, and edit the file.  But when I checkout branch
> 'main', I find that the file is edited there as well!  I do a git
> restore on main, and the file is also restored in the branch.  It's as
> if there are no branches at all.  What's going on?
I think I have an inkling of what's going on.  Part of my problem is
that it was hard to find Web search keywords that didn't give me complex
instructions on how to accomplish *precisely* what I'm trying to avoid
happening.  But what I managed to find is that it has to do with working
directories and indexes and stages and commits and... somehow the stash
command is supposed to help me with this, but before I touch that, I
think I show know what the hell is going on.  And I don't.

Git is so intricate it still has my head spinning.  I'm glad I saved
intermediate copies of the file, otherwise I could have lost everything
I did since my last backup.  I still haven't figured out how Git is
supposed to make my life easier.


Post a reply to this message

From: jr
Subject: Re: More Git weirdness
Date: 8 May 2023 07:40:00
Message: <web.6458df3e8cdc094558c093306cde94f1@news.povray.org>
hi,

Cousin Ricky <ric### [at] yahoocom> wrote:
> ...
> Git is so intricate it still has my head spinning.  ...  I still haven't
> figured out how Git is supposed to make my life easier.

my own 'git' usage/knowledge is v basic, I (often need to) use an etext for ref.
<https://drive.google.com/file/d/12lJMJYfrEg3BNV9M70-6tfe7_gYHawsg/view?usp=sharing>


regards, jr.


Post a reply to this message

Copyright 2003-2023 Persistence of Vision Raytracer Pty. Ltd.