POV-Ray : Newsgroups : povray.off-topic : Is my life easier yet? : Re: Is my life easier yet? Server Time
27 Feb 2024 18:30:41 EST (-0500)
  Re: Is my life easier yet?  
From: Jim Henderson
Date: 8 Oct 2021 11:12:20
Message: <61605fd4$1@news.povray.org>
On Thu, 07 Oct 2021 08:40:08 -0400, Cousin Ricky wrote:

> On 2021-10-06 10:55 PM(-4), Cousin Ricky wrote:
>> On 2021-10-06 12:09 PM (-4), Jim Henderson wrote:
>>> On Tue, 05 Oct 2021 23:18:53 -0400, Cousin Ricky wrote:
>>>> Damn.  I added a license and readme to GitHub, tried to pull the
>>>> changes to my local repo, and it's still giving me exit status 128. 
>>>> Do I have to do this rebase thing every time I make a change?  Why
>>>> does every simple thing have to be so freaking complicated?
>>> A rebase shouldn't be needed every time - how did you add the license/
>>> readme to github?
>> When you create an empty repo on GitHub, it encourages you to create a
>> readme and a license as part of the creation process.
>> For the rest of my modules, I sidestepped the problem by creating the
>> readme and license files in my local directories, and uploading them as
>> part of the initial push.
> Ignore that last answer; it's not just that all this wrestling with Git
> has caused me to lose track of days, it has caused me to lose track of
> my state of confusion.  Actually, after I pushed the project to GitHub,
> I used the buttons dedicated to adding the readme and the license.

Once done, you probably just needed to do a pull before making additional 
changes in your local copy.  But since those would be the only files that 
changed upstream, a rebase (or the stash option I mentioned earlier) 
should resolve it.

The only time a rebase should be necessary is if there are changes both 
remote and local that need to be reconciled, IIRC.


"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

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