A
A
Alexander Wolf2016-05-25 17:02:08
git
Alexander Wolf, 2016-05-25 17:02:08

Is it worth updating the feature-branch in git if the feature is being implemented for a very long time?

Good day, colleagues!
We have a project, we have allocated a new branch for a new feature. So the project itself has already managed to acquire a lot of commits, is it worth periodically pouring them into the feature branch in order to simplify the merge in the future (because it is not known how long this feature will be developed) or is it better not to touch it and pour it into master at the end and there already solve all problems with automerge?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
S
Sergey, 2016-05-25
@mannaro

whether to periodically merge them into a feature branch in order to simplify the merge in the future

Yes, it's worth it. And then test for functional regressions. Some rebase their branch to master so that it always seems fresh and the story is more linear.
There is a good rule that feature branches should always fast forward to master.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question