Hello everybody!

I posted this in the LINUX-UBUNTU echo as I use a flavor of it, but it seems to
be a ghost town??? No one home????

Anyway...

Basically I took over from abandonment a project which had code at one time on Github.... OK.. so I forked it... I've got my own repo of it... I cloned to the
box that will do the updates... The glitch is....

Later versions including the last one were not published on the source Github..
the GitHub one is several years out of date.

I have the raw files in a similar structure as they are on Github in another directory.... What I am looking to find is a way to take that updated version and turn it into the new branch I created to merge back into the master branch on MY Github...

This just raw files, NOT svn, or mercurial etc...

Or do I have to

git checkout -b newfangeldbranch

And then open each file in an editor and cut n paste the new ones in??? Really???

Git ain't my thing.. I am old school I have my own very outdated and manual way
of doing this for stuff I do... others will be involved... so I need to use something they can handle.

I am sure there is some automated way I can do this...

cp -r ~/lastsource ~/myproject ???????

Does git track the changes if they are cp'd in???
Thanks!

Rick


... Ding Dong the Witch is DEAD! I Made America Great Again! President Trump! --- GoldED+/LNX 1.1.5-b20160827
* Origin: Vina's Talos Moon Base Alpha (1:135/377)

Hello Mike!

13 Apr 17 23:53, you wrote to me:

I'd do:

git clone <github repo>
git branch newbranch
git checkout newbranch
/bin/cp -r ~/newfilespath ~/git-repo/
git add .
git commit

I'll give that a whirl... that was sort of what I had in mind, but I was not sure if git would track this with just a cp or it needed to actually have something like kate or nano touch the files....

FYI, when i was starting out with git, I often referenced this: https://services.github.com/on-demand/downloads/github-git-cheat-sheet .pdf

Thanks, easier said than done... old dog, new tricks, or new tricks, old dog...
don't tend to work well.. :)

Rick


... Ding Dong the Witch is DEAD! I Made America Great Again! President Trump! --- GoldED+/LNX 1.1.5-b20161221
* Origin: Vina's Talos Moon Base Alpha (1:135/377)

Hello Mike!

14 Apr 17 10:00, you wrote to me:

Oh, believe-you-me, If I didn't have to learn how to use it for my
job, I doubt I ever would have. I by no means consider myself a git expert, but I'm competent enough with it that I can branch, commit,
merge and create pull requests without having to look things up.

Up until a couple years ago I was still using CVS.

We won't even get into my "method" on this... its very, very, VERY OLD SCHOOL... and it make sense only to me... I've done it for my stuff for decades. Its fine for ME, and me alone... but once others get involved... nope..

Lab day for this is coming up.. so we will see...

Rick


... Ding Dong the Witch is DEAD! I Made America Great Again! President Trump! --- GoldED+/LNX 1.1.5-b20161221
* Origin: Vina's Talos Moon Base Alpha (1:135/377)