
更新文档:\docs\migration\4_0.md
ToggleStatusComponent
Removed FeatureConfigService from constructor.
DeleteItemComponent
the meaning of “deprecatedParams”: this block should contain all the parameters used in deprecated constructors( I mean the deleted constructor )?
it is like “old constructor”.
其他同事完成修改后,git pull origin epic/organization-deprecations to update your branch
一个潜在的 conflict 问题
答案
you can have 2 kinds of conflict like:
git recognized that both developers changed the same lines, and you must resolve it manually by choosing version (or both)
both people added the same variable in the same file, but in different places so git will not see any problem, but your IDE (eslint) should.
so you create an own branch fix/GH-11530, and wants to merge commit into epic/organization-deprecations.