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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,465,201
Community Members
 
Community Events
176
Community Groups

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

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

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events