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,363,123
Community Members
 
Community Events
168
Community Groups

I (have a PC) am having problems pushing/pulling with my friend (has a Mac). Working in Unity.

Hello, all, and thank you for your time.  My name is Julian. 

Long story short, I have a PC, and my friend has a Mac.  We are working on a project together in Unity.  

But whenever I try to push or pull, I cannot-- I get errors.  For instance, when I try to pull, I get this message.

 

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks fetch origin

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks pull origin master
From https://github.com/MagicMaxMark/Blotch
* branch master -> FETCH_HEAD

error: Your local changes to the following files would be overwritten by merge:
PaintBrushJulian/Assembly-CSharp-Editor.csproj PaintBrushJulian/Assembly-CSharp.csproj PaintBrushJulian/Assets/Art Studio.obj PaintBrushJulian/Assets/Art Studio.obj.meta PaintBrushJulian/Assets/Blotch.fbx PaintBrushJulian/Assets/Blotch.fbx.meta PaintBrushJulian/Assets/LEVEL.fbx PaintBrushJulian/Assets/LEVEL.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/ElongatedBody.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/JumpDown.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/JumpDown.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/JumpUp.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/JumpUp.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/New Animator Controller.controller PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/New Animator Controller.controller.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/Shortens.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/Shortens.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/banksleft.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/banksleft.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/banksright.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/banksright.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/elongate.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/elongate.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/straightensleftbank.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/straightensleftbank.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/straightensrightbank.fbx PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/animations/straightensrightbank.fbx.meta PaintBrushJulian/Assets/Prefabs/JulianAnimationPrefabs/stationary.fbx.meta PaintBrushJulian/Assets/Scenes/JulianAnimationTest.unity PaintBrushJulian/Assets/Scenes/SampleScene.unity PaintBrushJulian/Assets/UTJ.meta PaintBrushJulian/Assets/UTJ/Alembic.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Exporter.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Exporter/AlembicExporterEditor.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Exporter/AlembicExporterEditor.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicImporter.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicImporter.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicImporterEditor.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicImporterEditor.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamDescriptorEditor.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamDescriptorEditor.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamPlayerEditor.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Importer/AlembicStreamPlayerEditor.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Misc.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Misc/BoolDrawer.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Misc/BoolDrawer.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Timeline.meta PaintBrushJulian/Assets/UTJ/Alembic/Editor/Timeline/AlembicRecorderClipEditor.cs PaintBrushJulian/Assets/UTJ/Alembic/Editor/Timeline/AlembicRecorderClipEditor.cs.meta PaintBrushJulian/Assets/UTJ/Alembic/Materials.meta PaintBrushJulian/Assets/UTJ/Alembic/Materials/Overlay.mat PaintBrushJulian/Assets/UTJ/Alembic/Materials/Overlay.mat.meta PaintBrushJulian/Assets/UTJ/Alembic/Plugins.meta PaintBrushJulian/Assets/UTJ/Alembic/Plugins/x86.meta PaintBrushJulian/Assets/UTJ/Alembic
Completed with errors, see above.

 

 

I would appreciate any help I could get on this.  My friend isn't sure of what to make of this either.  I am very new to SourceTree.

 

Thanks,

-Julian

1 answer

0 votes
bgannin Atlassian Team Apr 17, 2019

Hi @Julian Olavegoya,

This StackOverflow answer is a great summary of what you're encountering. Instead of the terminal commands you should be able to use Sourcetree to perform the necessary steps 🤞Hope that helps a bit.

Brian Ganninger
Principal Developer, Sourcetree

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events