My friend and I are writing 1 program, and you have to combine it manually afterwards, can it be done automatically like that? How to make changes?

  • 3
    How about using a version control system? - Dmitry Shevchenko
  • What's wrong with Subversion? - SVD102
  • one
    @ SVD102 SVN is a version control system (VCS), but is not a distributed version control system (DVCS). With it, you must have a server and are tightly tied to it. If the server is not available, save the code will not work. - Nick Volynkin ♦
  • @Nick Volynkin Thank you. Everyone would give such comments, clearly in the case, and did not fool like some here ... - SVD102
  • @ SVD102 thanks, try to set a good example) - Nick Volynkin ♦

1 answer 1

You need a version control system. The comments rightly offer two of the most modern and popular: Git and Mercurial. Personally, I prefer and love Git, but this is subjective.

In general, the process will be organized as follows:

  • The local repository of each of you on the working machine
  • Remote repository - for a beginner, the easiest way is to use GitHub or Bitbucket hosting.
  • Each developer has its own branch where you make changes.
  • There is a central branch to which these changes are periodically added.
  • When adding changes, there will inevitably be conflicts that you will have to resolve.

Regardless of your choice:

  • Read the documentation, at least a beginner course. Continue reading the documentation afterwards until the Tao comprehension of the chosen system.
  • To start, go through some online course, there are many of them and all are quite good. (Paid to take it makes no sense)
  • If you have questions, come to Ru.SO.
  • Merge changes into the central branch as often as possible to avoid hellish suffering, intractable conflicts and stabbing (see below for continuous integration).

Related issues recommended for reading:

About Hg did not find suitable, add.