MCServer git workflow
#1
Here is a simple workflow for git, version one.

For simple development, this is all you need to know.


Attached Files
.txt   temp.txt (Size: 1.7 KB / Downloads: 293)
Reply
Thanks given by:
#2
But can I still use TortoiseSVN to commit changes? I use it for all my plugins that I upload to github.
Reply
Thanks given by:
#3
Yeah of course, just do the branching and PRs on github.

There's also TortoiseGit if you want it.
Reply
Thanks given by: NiLSPACE
#4
I just noticed that github turns small changes into big changes. Wink https://github.com/mc-server/MCServer/co...7173af5a19
Reply
Thanks given by:
#5
(07-27-2013, 11:08 PM)STR_Warrior Wrote: I just noticed that github turns small changes into big changes. Wink https://github.com/mc-server/MCServer/co...7173af5a19

Does this fix bug number one in FS #423? (Food not reset upon respawn?)
Reply
Thanks given by:
#6
Yeah, the problem with that is probably something to do with using SVN and gitTongue

Also, you didn't follow the workflow and work in your own branch!
Reply
Thanks given by:
#7
(07-27-2013, 11:25 PM)tigerw Wrote: Does this fix bug number one in FS #423? (Food not reset upon respawn?)
Yes it does.

bearbin Wrote:Also, you didn't follow the workflow and work in your own branch!
But if everyone creates a branch for their own everyone gets an outdated source right?
Reply
Thanks given by:
#8
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.
Reply
Thanks given by:
#9
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.
Reply
Thanks given by:
#10
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.
Reply
Thanks given by:




Users browsing this thread: 5 Guest(s)