Re: Git Migration
Posted: 28 Aug 2017, 16:07
Old auth with the forum name/pass is back. Please test.
High Quality Resources for Collectible Card Games and Home of the CCGHQ Team
https://www.slightlymagic.net/forum/
https://www.slightlymagic.net/forum/viewtopic.php?f=52&t=20884
Should a new merge request be assigned to someone?friarsol wrote:8. Create a merge request from your forked repo: https://git.cardforge.org/<username>/forge/merge_requests
Nah. Being unassigned will let people know noone is looking at it. Probably your best bet is jump into Discord and tell people what the branch does, and walk someone through it if they need to.hidalgo wrote:Should a new merge request be assigned to someone?friarsol wrote:8. Create a merge request from your forked repo: https://git.cardforge.org/<username>/forge/merge_requests
So here's what the internet seems to recommend:Seravy wrote:So how do I import the patches into "branches" and what do I do after that?
There are basically two things I'd like to know :
-How to load and submit the already made patches from half a year ago for inclusion which are ready for that
-Once I set up all these branches, how do I select which of those I want to include when I compile it into a working game? (as I definitely want to include stuff that's I'm currently using but likely not things I'll work on and are incomplete in the future)
(Disclaimer: I didn't work with patches before, and haven't worked with Eclipse in a while, but I do know my way around git)Seravy wrote:Wait so to actually use my work I need to STILL make patches and apply them locally every time I want to compile but in a much more complicated way than before as Eclipse won't support it directly?
master --*-------*---....
\ \
patch-1 *---*---!*
\ \ \
playing *---*--*-*
/
more patches ....
Okay, so I have a personal project I am working with that uses Forge as it's base. In order to stay updated, do I have to push the changes or is it enough to commit the change locally? Is it relatively easy to update my source to the latest version if I haven't pushed the change?friarsol wrote:5. Stage your content to be added: git add <filenames>
6. Commit the change locally: git commit -m <message>
7. Push the change up with: git push
7a. If it's the first time pushing to this branch, you'll need to specify the remote: git push -u origin <branchname>
8. Create a merge request from your forked repo: https://git.cardforge.org/<username>/forge/merge_requests