All geek questions in one place

Git branch structure for client and server

For one of my CS classes, I and the group are writing an application using the client / server architecture. I was curious what best practices would be for organizing a project in the Git repository. I mean, should we structure such directories:

ProjectDir/
    Clients/
        Client1/
            # files...
        Client2/
            # files...
    Server/
        files....

and track everything in the same Git branch, or we must create separate branches for clients and server, for example:

on the branch Server:

Project/
    Server/
        # files...

on the branch Clients:

Project/
    Client1/
        # files...
    Client2/
        # files...

I don’t know if this matters, but this will be the first project I will undertake using Git, where the team consists of more than two people, and I want to make sure that traction and merging are as simple as possible ...

+3
source share
2 answers

, , () , , VCS, SVN. SVN () Git , Git . , Git , ( , , , ).

SVN , . , SVN ( SVN - , ). , . , . , , , - . , , , .

- , . , . , . , , .

Git , , , . , , .

+2

, , :

  • , , . , , , , . , , , , , , . /p >

  • , . , , , , / ( ). .

, , SCM: , , .

, diffs , , ( ) - git , , .

0

Source: https://habr.com/ru/post/1792397/

More articles:


All Articles