josephdburdick / git-workflow Goto Github PK

Hey Joe, I still have some open questions that I would like to clarify. Thanks for your help !

Let's say a bunch of people are working on a given featureName.

From the documentation, I understood : we have master branch ; we create featureName branch ; and each one of us working on the feature uses the own username/featureName branch until ready to be merged to featureName branch. And we could rebase with otherUsername/featureName if that collaboration is needed.

• From your description it sounded like we use directly username/featureName without a "common" featureName branch ?

We should regularly sync our own username/featureName branch with featureName branch (or master ?) to make sure our progress is not going to create conflicts.

• Please confirm or discuss whether this is what helps preventing the merge conflicts.
  I understand how rebase helps keeping the history logs clean. What is not clear is how using rebase is reducing the conflicts. If several persons work on the same code piece in different branches (their own username/featureName), how does it make any difference compared to using the git merge command.