Geek asks and answers

Merging functional branches with multiple authors

On the website, the affiliate function must be combined with the master after a couple of weeks of development by both front-end and third-party developers.

The problem is that third-party developers are reluctant to resolve conflicts with CSS and templates, and third-party developers cannot resolve conflicts with source texts. How do you solve this?

Some ideas that I had:

  • One of the developers resolves "their" conflicts locally and passes the patches to another developer who will perform the real union
  • Partial merge somehow, splitting merge into multiple commits
  • Use a different vls workflow / branching strategy
+3
source share
2 answers

(rebase --interactive) , , .

, .

, ,

back-end , , .
, back-end codebase front-end. .
( ) .

+2

. , , . , :)

. , , , ?

0

More articles:


All Articles