Thanks! Rebasing might suffice in some cases, particularly in a rapid development flow when topic branches are short-lived, and the team appreciate a linear history more than a more verbose log. Otherwise, merging tends to be friendlier. 😉
Here's my strategy. Fork out the feature branch from master, say my-new-feature. Now every mate from my team branches from the my-new-feature branch for their part of work and keeps it merging back to my-feature-branch. Whille I keep rebasing the my-new-feature branch with master on daily basis. Once the feature is ready, the my-feature-branch is merged back to master.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Thanks! Rebasing might suffice in some cases, particularly in a rapid development flow when topic branches are short-lived, and the team appreciate a linear history more than a more verbose log. Otherwise, merging tends to be friendlier. 😉
Here's my strategy. Fork out the feature branch from
master, saymy-new-feature. Now every mate from my team branches from themy-new-featurebranch for their part of work and keeps it merging back tomy-feature-branch. Whille I keep rebasing themy-new-featurebranch withmasteron daily basis. Once the feature is ready, themy-feature-branchis merged back tomaster.