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,456,305
Community Members
 
Community Events
176
Community Groups

Resolve conflicts in confluence page

While editing the confluence page i got notification saying Green is conflicts and red is removed and blue for formatting changed.

I want to keep what is in green as i had added quite a lot of stuff in the page. I can't see any button to save or merge the conflicts to current version. I dont want to lose my stuff. 

 

1 comment

Er, not quite.  You got told Green is added, not "conflicts".  (Conflicts would include green and red-removed)  This avoids the need to "merge".  Save what you have and then edit again, removing anything that was added that you don't like, and adding back anything that should not have been removed.

Comment

Log in or Sign up to comment
TAGS

Atlassian Community Events