Best way to code together?

[RediL]

So, I read this thread: [url]http://facepunch.com/showthread.php?t=1484423&p=48622089#post48622089[/url]
What is the best way to code together with multiple people on the same project?

Also can you make the server auto pull from github?

[IAMRichardT]

Collaboration and everyone being informed. And assigned projects. Mistakes are bound to be made, but you must make them as minimal as possible. You can use programs to autopull from Github. Depends on the access you have to the server, and/or if you have a control panel. Some control panels have SVN updaters and some allow for scheduled fetches, if you have remote access abilities with a CP, then you can use an application to do such a task.

[DevulTj]

There's a website called [url]https://ftploy.com/[/url] that allows you to automatically upload your github repo onto a server, it updates aswell.

[Mikey Howell]

c9.io or codeshare

[YourStalker]

AOL Instant Messenger

[DrVrej]

Steam Messging

[Exploderguy]

The thing I don't get about Git teamwork is what if your editing the same file? One updates/uploads it to Git then another dude does 1 min later and the first dudes work is gone?

[whisperity]

[QUOTE=Exploderguy;48625722]The thing I don't get about Git teamwork is what if your editing the same file? One updates/uploads it to Git then another dude does 1 min later and the first dudes work is gone?[/QUOTE]

Not at all. When the second guy tries to push, the server will tell him that something is not right and the history of the project diverged.
So the second guy needs to fetch the changes from the server, and merge the changes together on his local copy. Sometimes the merge will be easy, sometimes it will require you to physically review lines or hunks of the file to decide whose change is going to be kept (you can select both changes too!).
After the second guy merged the changes together, a new commit, a new "most recent state" is created and the second guy will be able to push the changes.

(Of course if the second guy goes "okay, force push" then the first guy's changes are gone, but you should only force push in extreme circumstances.)

[Semajnad]

[QUOTE=Exploderguy;48625722]The thing I don't get about Git teamwork is what if your editing the same file? One updates/uploads it to Git then another dude does 1 min later and the first dudes work is gone?[/QUOTE]

Also to add to what whisperity said, don't forget that every change is tracked as commits, so you can always roll commits back, or change them etc.

I haven't worked on a project with someone before, but version control is built for these kinds of situations. Usually it will tell you if what you're trying to push clashes with a change that has already been made as said above.

Even with version control it's best to keep communication up on what parts you're going to be working on.

[Zeh Matt]

A golden rule I learned over the time in a software company is: Never work on the same thing, you just gonna get conflicts, assign individual tasks that have nothing to do with each other (best case), sometimes its not possible but even then you can split a task into multiple sub tasks.

[ExtReMLapin]

You can work on the same project, not on the same file, it's just a bad idea.

[Sportsfreak.]

Use BitBucket if anything it also has free private repositories and is better than GitHub as well.

[knoxed]

[QUOTE=Sportsfreak.;48627249]Use BitBucket if anything it also has free private repositories and is better than GitHub as well.[/QUOTE]

GitLab does a good job providing free private repos too

[0bama]

Anytime I've worked on a project with someone else, I made sure I wrote 99% of the code without saving, of course-- then I always pressed Alt + F4 to "seal the deal" to say the least.