The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning
Events
Champions
Release Notes
Community
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning Events Champions Release Notes
Forums
Home Q&A Discussion groups Articles Ask a question Search
Learning Events Champions Release Notes

Forums

Articles
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

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

15001098982
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!
Get involved
June 29, 2022

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

Watch
Like Be the first to like this
619 views

0 answers

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

    See all events
    Community
    Forums
    FAQs Forums guidelines
    Learning
    About learning Resources
    Events
    Champions
    Release Notes
    Copyright © 2026 Atlassian
    Privacy Policy Notice at Collection Terms Security