Цитата:
Сообщение от
imir
Это к вопросу мержа, а вопрос конфликтов - окей, я в своем бранче, ноя в своем бранче параллельно пилю несколько модиф, или одну пилю, три тестируются.. нужно отделить свое же добро от своего же.
Feature isolation
Feature isolation is a special derivation of the development isolation, allowing you to branch one or more feature branches from main, as shown, or from your dev branches.
Feature Isolation branching strategy
When you need to work on a particular feature, it might be a good idea to create a feature branch.
Keep the lifetime of feature work and the associated feature branch short-lived. Forward integrate (FI) changes from the parent branch frequently. Reverse integrate (RI) back to the parent only when some agreed team criteria, for example definition of done, is met. Rollback of features on main can be costly and may reset testing.