How do I setup AtomCMS and Github?

[Blasteh]

I followed @Object's tutorial, however, it seems to be a little outdated, as I don't have some features that were added in the past ~2 months in the Github. I know this is a noob question, but how can I setup my files (that are already fully setup), and GitHub desktop to pull in updates to my local files when I want to from Object's Git?

I was playing around, and I committed and it basically wiped all my files. I just reverted it and it was fine, but I want to try to prevent overwriting all the files. Can I just download a single update, such as a number (e.g. #134?)

 

[TesoMayn]

If I understand what you're saying
You cloned the git, made changes (eg: edited config/app.php) and want to pull any future updates without overwriting edited files (eg: config/app.php)?

If so, you should be able to just commit the files to your local repo git commit -am "Commit message" then git fetch to get the latest changes. Finally, just merge git merge origin/main (assuming origin/main is the remote/branch)


So for just the commands:

git commit -am "Message"
git fetch
git merge origin/main

It's been a while, but I believe this will work.

However, the downside will be if any updates change the structure or add anything necessary to the files you've edited, your local version won't contain them unless you manually add them.

---

Using GitHub Desktop you just:

Fetch origin
Select the branch
Pull origin

In the "changes" tab, stage which changes you want.

Commit

 

[Blasteh]

If I understand what you're saying
You cloned the git, made changes (eg: edited config/app.php) and want to pull any future updates without overwriting edited files (eg: config/app.php)?

If so, you should be able to just commit the files to your local repo git commit -am "Commit message" then git fetch to get the latest changes. Finally, just merge git merge origin/main (assuming origin/main is the remote/branch)


So for just the commands:

git commit -am "Message"
git fetch
git merge origin/main

It's been a while, but I believe this will work.

However, the downside will be if any updates change the structure or add anything necessary to the files you've edited, your local version won't contain them unless you manually add them.

---

Using GitHub Desktop you just:

Fetch origin
Select the branch
Pull origin

In the "changes" tab, stage which changes you want.

Commit

Much appreciated, Teso!