KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
I know the thread which says that rebase is for small changes of teamMates, while merge for large changes. I keep three Gits of three teammates in the following directory structure where we all have the same initial code: project | - I | - myTeamMate1 | - myTeamMate2 The branches are not in the same Git. This means that I cannot use rebase and merge. I have used vimdiff to sync changes between teamMates. However, this is time-consuming. I have unsuccessfully tried to make the following directory structure where all branches are under one Git: project | - I - myTeamMate1 - myTeamMate2 However, I run clone command for me and for my teammate: git clone <url> and I get the error message after running the second clone for my teammate fatal: destination path 'dotFiles' already exists and is not an empty directory. Which directory structure should I use with a team of 3 people, such that I can use rebase and merge commands?
Tags (comma-separated)
Save Edits
Cancel