StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POWhat git workflow to use for 2 non-co-located developers?
text
Body
copied!<p>I've got a contract to write part of a program. The person writing the other part is in another city. I want to find a convenient way to send changes back and forth. For other reasons, I'd like to learn to use git as a distributed VCS and email changes back and forth. (I've worked with SCCS, RCS, and PVCS before, always with locking. I want to push myself to learn how to better use branching & merging and to not depend on a central server.)<br><br> We need to do the following two tasks (pretty standard list):<br> (a) Each of us contribute to bug fixes and new features that require changes to both parts.<br> (b) Compile and package binaries for customers.<br> (We also need to work separately on features that don't depend on the other, but I assume that anything that works for task (a) will work for this also.)<br><br> Background: The other guy has never used a VCS before; he's a little resistant to the idea. He didn't even know that they don't all still use locking checkouts. I'd need to understand everything we do in enough depth that I can help him over the rough spots with not much frustration on his part. He's also very uncomfortable with storing the source on a server, which is another reason to prefer emailing changes. We can easily encrypt them.<br><br> Other possibly relevant context: We're using Delphi on Windows as our development environment. It's extremely unlikely we'd ever add another developer. We only need to package customer versions a couple of times a year, if that. The number of customers will probably never exceed ten.<br><br> Questions:<br> 1) Should I use this project to learn techniques for distributed development? Or is that so much overkill that I should just do something simpler? I don't mind spending some extra time on the learning, but no more than a couple of weeks.<br><br> 2) Assuming "Yes" to question 1, what workflow should we use for each of the tasks above?<br><br> 3) What Windows GUI programs will do all the required tasks? (I'm very comfortable with command line stuff; he's not.)<br><br> Thanks for your help.<br><br> I have written a pretty detailed tutorial on "gitting started" that shows what I've learned so far about using git. It's at <a href="http://xorandor.com/GittingStarted" rel="nofollow noreferrer">http://xorandor.com/GittingStarted</a> if you want to read it so far. I tried to write it for a git novice who knows a little bit but not a whole lot about VCSs in general. I plan to add to that as I learn more.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload