07-27-2013, 10:33 PM
Here is a simple workflow for git, version one.
For simple development, this is all you need to know.
For simple development, this is all you need to know.
MCServer git workflow
|
07-27-2013, 10:33 PM
Here is a simple workflow for git, version one.
For simple development, this is all you need to know.
07-27-2013, 10:41 PM
But can I still use TortoiseSVN to commit changes? I use it for all my plugins that I upload to github.
07-27-2013, 10:45 PM
Yeah of course, just do the branching and PRs on github.
There's also TortoiseGit if you want it. Thanks given by: NiLSPACE
07-27-2013, 11:08 PM
I just noticed that github turns small changes into big changes.
![]()
07-27-2013, 11:25 PM
(07-27-2013, 11:08 PM)STR_Warrior Wrote: I just noticed that github turns small changes into big changes. Does this fix bug number one in FS #423? (Food not reset upon respawn?)
Yeah, the problem with that is probably something to do with using SVN and git
![]() Also, you didn't follow the workflow and work in your own branch!
07-27-2013, 11:33 PM
07-27-2013, 11:38 PM
No, not at all!
Basically you take a branch off the current master, do your changes then put a pull request back. The master gets updated with your changes, you leave the branch to rot and start a new one. Therefore, for everyone to get updated source they just pull the master, and nobody interferes with each other.
07-27-2013, 11:42 PM
So after a while we have 1 million branches? I was thinking use the pull request instead of the patch files somebody has to create to contribute.
07-27-2013, 11:43 PM
Use the pull request for every new feature.
We can delete the branches once the feature is complete, but in Git branches are very lightweight so you just make a new one when you want a feature, unlike SVN. |
« Next Oldest | Next Newest »
|