How to maintain physical branch folders for git as available in TFS?

Vote count:

0

We have a huge product and that has many features, each features take very long, so we are maintaining short lived feature branches in TFS. For example,

MAIN/
   PROJECTMGT
   EMAILMGT
   etc..

And once complete, they are merged back to MAIN, and each different development team works on different branches.

Merge Process

Since each team works on different branch, there is no conflict, however person responsible for merging branches onto MAIN needs to see a clear view of files in different folders. Because we need to test and review the branch before merging, we also need to see conflict of different branches and resolve them clearly.

Now we are moving onto git, and as I am learning git, I have little difficulty in how to organize branches. As while working on the file and folder structure, we have no idea of which branch we are actually in.

We just ran a test on git, and most of us who operate on multiple branches got confused and we also made mistakes in merge.

TFS automatically merges everything into same branch where file actually belongs without specifying branch.

I was reading about this and I saw some suggestion of creating multiple clones to emulate TFS kind of physical folder branching.

Can someone guide me how can I do it?

asked 15 secs ago

Akash Kava

17.4k