Menu
Forums
All threads
Latest threads
New posts
Trending threads
New posts
Search forums
Trending
What's new
New posts
New profile posts
Latest activity
Members
Current visitors
New profile posts
Search profile posts
Upgrades
Log in
Register
What's new
Search
Search
Search titles only
By:
All threads
Latest threads
New posts
Trending threads
New posts
Search forums
Menu
Log in
Register
Navigation
Install the app
Install
More options
Contact us
Close Menu
Forums
Server Development
Habbo Retros
Habbo Q&A
How do I setup AtomCMS and Github?
JavaScript is disabled. For a better experience, please enable JavaScript in your browser before proceeding.
You are using an out of date browser. It may not display this or other websites correctly.
You should upgrade or use an
alternative browser
.
Reply to thread
Message
<blockquote data-quote="TesoMayn" data-source="post: 476713" data-attributes="member: 8605"><p>If I understand what you're saying</p><p>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)?</p><p></p><p>If so, you should be able to just commit the files to your local repo [ICODE]git commit -am "Commit message"[/ICODE] then [ICODE]git fetch[/ICODE] to get the latest changes. Finally, just merge [ICODE]git merge origin/main[/ICODE] (assuming origin/main is the remote/branch)</p><p></p><p></p><p>So for just the commands:</p><p>[code]</p><p>git commit -am "Message"</p><p>git fetch</p><p>git merge origin/main</p><p>[/code]</p><p></p><p>It's been a while, but I believe this will work.</p><p></p><p>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.</p><p></p><p></p><hr /><p></p><p>Using GitHub Desktop you just:</p><p></p><p>Fetch origin</p><p>Select the branch</p><p>Pull origin</p><p></p><p>In the "changes" tab, stage which changes you want.</p><p></p><p>Commit</p></blockquote><p></p>
[QUOTE="TesoMayn, post: 476713, member: 8605"] 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 [ICODE]git commit -am "Commit message"[/ICODE] then [ICODE]git fetch[/ICODE] to get the latest changes. Finally, just merge [ICODE]git merge origin/main[/ICODE] (assuming origin/main is the remote/branch) So for just the commands: [code] git commit -am "Message" git fetch git merge origin/main [/code] 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. [HR][/HR] Using GitHub Desktop you just: Fetch origin Select the branch Pull origin In the "changes" tab, stage which changes you want. Commit [/QUOTE]
Insert quotes…
Verification
Post reply
Forums
Server Development
Habbo Retros
Habbo Q&A
How do I setup AtomCMS and Github?
Top