Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

我在master上修改的代码,想合并到text分支,但是不能合并,因为逻辑处理不同,应该怎么操作

15001098982
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
June 29, 2022

比如,底部导航是一样的,但是master和text按钮点击跳转是不一样的,所以两个代码不能合并,这种情况应该怎么处理?可能有人会说先把公共的写出来再创建text,可是第二次如果又发生了这种情况怎么办?比如master上又修改了代码,又成了共有的了,但是之前的不一样,这种应该怎么办?我不能把相同的代码写两次吧

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events