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,555,973
Community Members
 
Community Events
184
Community Groups

How to undo an attempted conflicting merge

I'm working in Unity and there was an instance where the same scene was accidentally worked on by 2 people and their files are essentially binary or so large I don't know how to locate the merge conflicts in a text editor. I made and pushed a commit to the master while he was working on the level and he attempted to push shortly after. There is a conflict and I'm trying to reset the origin back to the highlighted commit but even resetting the branch to this commit has been unsuccessful. The problem is that as soon as this gets checked out it requires me to pull again but I'm still getting my bearings around Git and Sourcetree so I'm not quite sure how to proceed. Also it's ok in this instance if we lose the work done in the commit scribbled out in the second picture.what I have.pngWhat I want.png

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events