Are you in the loop? Keep up with the latest by making sure you're subscribed to Community Announcements. Just click Watch and select Articles.

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

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


1 badge earned


Participate in fun challenges

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


Gift kudos to your peers

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


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!


What causes git to merge contents from different files?


I am having an issue where git is trying to merge contents from completely different files into each other and if it really breaking my project as you can imagine.  Here is an example of what I see after a merge:

2023-10-20 10_03_02-Sourcetree.png

What's extra special is that it seems that the file being merged in HEAD is pulling it's contents from another file, and the remote branch is the one that has correct contents in this case, but I do see it happening the other way around as well where the current head is the correct contents. 

Anyone have any thoughts on this?  It is happening to us on multiple projects, for multiple developers.

EDIT: to add some detail.  In the case above, the XRGeneralSettings.asset.meta file does not yet exist in HEAD.  This merge should simply be creating it from the remote branch, but instead, there is a conflict being generated.

0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events