[WingmanNZ]

Hi all.
I have set up a github repo for a new skin i am making and pushed my local copy to the repo. i now want to know how to set it up so User A and user B can both work together on the repo. i don't know how forks work etc. can someone be kind enough to explain as simply as possible, the basic process of two coders working together?

can we both just work off the master? or will one persons work override the other if the XML conflicts?

thanks in advanced

[seedzero]

Hi all.
I have set up a github repo for a new skin i am making and pushed my local copy to the repo. i now want to know how to set it up so User A and user B can both work together on the repo. i don't know how forks work etc. can someone be kind enough to explain as simply as possible, the basic process of two coders working together?

can we both just work off the master? or will one persons work override the other if the XML conflicts?

thanks in advanced

There's a couple of methods of collaboration, depending on how many people are involved and the complexities of sharing the work. First like you said you can fork the original repo then merge each other's work.
You can also follow this to allow multiple users for the same repo: http://github.com/guides/managing-collaborators

Github has some pretty good documentation: http://github.com/guides/Home

[WingmanNZ]

There's a couple of methods of collaboration, depending on how many people are involved and the complexities of sharing the work. First like you said you can fork the original repo then merge each other's work.
You can also follow this to allow multiple users for the same repo: http://github.com/guides/managing-collaborators

Github has some pretty good documentation: http://github.com/guides/Home

thanks. just out of curiosity, what are some of the other methods for collaborating? (there are only two coders at this stage)