Question: How to collaborate?
In my musing with helpCloning a github repo into the workspace, I was thinking, how would more than one dev work on a feature together (i.e. in a feature branch in git)?
Let's say, the standing process is to create a workspace with a branch of a repo.
Would other devs open their own workspace and it gets also its own clone of the same repo, with that new branch though? So, basically, the branch must be pushed to origin, before any work starts at all? What happens with merge conflicts?
Or, would the other devs get a workspace, but possibly work off of the same volume attached to any of these "branch" workspaces? So, they are all working on the same exact code base together? They might have race conditions where one makes a change, hasn't saved it yet, the other makes a change and saves it, then the other dev saves her work and the other dev's changes are nullified.
I'm sure this problem has been solved by many already collaborating. What is the right way? I'm thinking the first, and if there are merge conflicts they just have to be dealt with.
Or is there something completely different I'm not even in the know about?
Let's say, the standing process is to create a workspace with a branch of a repo.
Would other devs open their own workspace and it gets also its own clone of the same repo, with that new branch though? So, basically, the branch must be pushed to origin, before any work starts at all? What happens with merge conflicts?
Or, would the other devs get a workspace, but possibly work off of the same volume attached to any of these "branch" workspaces? So, they are all working on the same exact code base together? They might have race conditions where one makes a change, hasn't saved it yet, the other makes a change and saves it, then the other dev saves her work and the other dev's changes are nullified.
I'm sure this problem has been solved by many already collaborating. What is the right way? I'm thinking the first, and if there are merge conflicts they just have to be dealt with.
Or is there something completely different I'm not even in the know about?
Discord
Discord is the easiest way to communicate over voice, video, and text. Chat, hang out, and stay close with your friends and communities.
