 |
|
|
|
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On 1/15/26 09:56 (-4), Mr wrote:
>
> Hi, I don't know how far you've been in the journey to try and make sense of
> (g)it...
A little over 4 years, and not very far.
> a)Did you read ProGit the free ebook?
> https://git-scm.com/book/fr/v2
My eyes are glazing over, and my head is in a fog.
> b)Does this video tutorial help for your specific question?
> https://www.youtube.com/watch?v=Ala6PHlYjmw
The video's "uncomfortable truth" has been blaringly obvious to me from
the start. After 4 years, it seems clear that I still have no idea
what's going on. *watches video* I think I'm even more confused than I
was before. I think.
I remember once having a detached head. I had no idea what that meant
at the time, or what I did to detach it. (I ended up deleting the
repository and restarting from scratch.) Now I have some vague idea,
but I can't explain that idea to myself, and it's probably wrong anyway.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On 2026-01-13 18:29 (-4), Shay wrote:
>
> If you aren't merging into a shared branch (i.e., if you're the only one working
> on a project and you aren't updating two branches at once), I wouldn't give it a
> second thought. The main idea is to avoid merge commits (which you can easily
> end up with anyway if you accept a pr), but you won't have merge commits as a
> single user if you [...]
At some point I'll want to git clone POV-Ray and submit pull requests.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
Cousin Ricky <ric### [at] yahoo com> wrote:
> On 2026-01-13 18:29 (-4), Shay wrote:
> > The only thing branching is giving you here is a "save point" in case you want
> > to discard an entire feature. Git, like many things, is as hard as you want to
> > make it.
>
> What if I don't want to make it hard, and it's hard anyway?
use the parts *you* need, because you may never use the parts you imagine you
*might* need, even if you *do* become advanced.
able to code. Submit a request for typos in the README if you like. That is
straightforward, done the same way by thousands, clearly documented online, and
a way to use tools for the exact purpose they were designed.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
"Shay" <nomail@nomail> wrote:
> Cousin Ricky <ric### [at] yahoocom> wrote:
> > On 2026-01-13 18:29 (-4), Shay wrote:
> > > The only thing branching is giving you here is a "save point" in case you want
> > > to discard an entire feature. Git, like many things, is as hard as you want to
> > > make it.
> >
> > What if I don't want to make it hard, and it's hard anyway?
>
>
>
> use the parts *you* need, because you may never use the parts you imagine you
> *might* need, even if you *do* become advanced.
>
>
>
> able to code. Submit a request for typos in the README if you like. That is
> straightforward, done the same way by thousands, clearly documented online, and
> a way to use tools for the exact purpose they were designed.
Yes, Consider it a scaffolding over which you do not HAVE to walk... but COULD
once people responsible for it will lead you by the hand... one floor at a
time... meanwhile you are allowed to walk beneath remote admins, and Git does
provide you some safer space, no matter how intimidating its shadow is above
your head :-P Here is an example : Instead of branches, you could have just
used "stash" for now, which I find simpler because of its being local.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
hi,
Cousin Ricky <ric### [at] yahoocom> wrote:
> On 1/15/26 09:56 (-4), Mr wrote:
> > Hi, I don't know how far you've been in the journey to try and make sense of
> > (g)it...
> A little over 4 years, and not very far.
>
> > a)Did you read ProGit the free ebook?
> > https://git-scm.com/book/fr/v2
> My eyes are glazing over, and my head is in a fog.
> ...
there are alternatives, too :-).
<fossil-scm.org/home/doc/trunk/www/index.wiki>
regards, jr.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On 2026-01-22 23:23 (-4), Shay wrote:
>
> You’re making it hard. Why are you branching at all? Don’t get caught up in
> trying to do what “advanced users” do, because advanced isn’t linear. Learn to
> use the parts *you* need, because you may never use the parts you imagine you
> *might* need, even if you *do* become advanced.
I'm branching because I have future plans and tentative ideas for some
of my projects that I'm not ready to incorporate into the main project.
I also have user manuals and READMEs for my Object Collection
contributions that will need to be updated once the Object Collection is
rebooted. Up till now, I've been renaming files or keeping them in
separate directories--or, in the case of the user manuals and READMEs,
having to revert the files every time I push an update to GitHub. This
is rather cumbersome, and git branches seems (to me) to be suitable for
this sort of workflow.
> Branching itself is easy enough. Maybe find a workflow where it’s required. Fork
> a repo, make a change, then submit a pull request. You don’t even need to be
> able to code. Submit a request for typos in the README if you like. That is
> straightforward, done the same way by thousands, clearly documented online, and
> a way to use tools for the exact purpose they were designed.
Branching seems super simple on paper, but in practice, it doesn't
behave the way I expect it to. There is something conceptually
fundamental about git that I do not understand, and I feel that until I
do understand whatever it is that I'm missing, I will continue to be
frustrated with git, no matter how easy or "advanced" the feature.
I think I need to take a class. Not a video, not a tutorial, but an
actual class.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On 2026-01-23 09:39 (-4), Mr wrote:
>
> Yes, Consider it a scaffolding over which you do not HAVE to walk... but COULD
> once people responsible for it will lead you by the hand... one floor at a
> time... meanwhile you are allowed to walk beneath remote admins, and Git does
> provide you some safer space, no matter how intimidating its shadow is above
> your head :-P Here is an example : Instead of branches, you could have just
> used "stash" for now, which I find simpler because of its being local.
But I don't understand what stash does. I don't know what you mean by
your scaffolding or "walk beneath" analogy. I DON'T UNDERSTAND ANY OF THIS!
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On Sat, 24 Jan 2026 21:00:03 -0400, Cousin Ricky wrote:
> On 2026-01-23 09:39 (-4), Mr wrote:
>>
>> Yes, Consider it a scaffolding over which you do not HAVE to walk...
>> but COULD once people responsible for it will lead you by the hand...
>> one floor at a time... meanwhile you are allowed to walk beneath remote
>> admins, and Git does provide you some safer space, no matter how
>> intimidating its shadow is above your head :-P Here is an example :
>> Instead of branches, you could have just used "stash" for now, which I
>> find simpler because of its being local.
>
> But I don't understand what stash does. I don't know what you mean by
> your scaffolding or "walk beneath" analogy. I DON'T UNDERSTAND ANY OF
> THIS!
'git stash' takes the current set of changes (for tracked files only) and
stores them separate from the current branch. It's a way of reverting
changes without undoing them; you can `pop` the stash to reapply the
changes.
--
"I learned long ago, never to wrestle with a pig. You get dirty, and
besides, the pig likes it." - George Bernard Shaw
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On Sat, 24 Jan 2026 20:55:50 -0400, Cousin Ricky wrote:
> I think I need to take a class. Not a video, not a tutorial, but an
> actual class.
https://training.linuxfoundation.org/training/git-for-distributed-
software-development-lfd109x/ might be a good free option to take a look
at. I haven't looked at it, but I know folks at the Linux Foundation who
are involved in training, and they generally do a good job.
I see there's a module on branches as well.
--
"I learned long ago, never to wrestle with a pig. You get dirty, and
besides, the pig likes it." - George Bernard Shaw
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
| |
|
|
On 2026-01-24 22:00 (-4), Jim Henderson wrote:
> On Sat, 24 Jan 2026 20:55:50 -0400, Cousin Ricky wrote:
>
>> I think I need to take a class. Not a video, not a tutorial, but an
>> actual class.
>
> https://training.linuxfoundation.org/training/git-for-distributed-
> software-development-lfd109x/ might be a good free option to take a look
> at. I haven't looked at it, but I know folks at the Linux Foundation who
> are involved in training, and they generally do a good job.
>
> I see there's a module on branches as well.
Thanks, I'll look into it.
Post a reply to this message
|
|
| |
| |
|
|
|
|
| |
|
|
