2

I am working on a git branch in a Unity project. Issue with Unity is that you get loads and loads of files which can be binary and very large. Well, it's game development.

I'd like to merge my branch to the master, which I haven't done for a couple weeks, so I execute as the first step

git checkout master

Git will never finish this command, I just get a blinking curser below the line. I can see in the GitHub Desktop client that 2100 files are being changed ( this happens in a few minutes) due to the checkout however the branch is never changed. I had it running for 8 hours now and nothing.

I really don't know what I can do now - any suggestions?

Axel dabee
  • 33
  • 7

1 Answers1

0

You could try and clone again repo in a new folder, and then add your previous folder as a remote

git clone /url/for/repo/unity unity2
cd unity2
git remote add first_unity ../unity
git fetch fist_unity
git merge first_unity/my_branch
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Hi, I'm attempting a clone but it gets stuck as well...oh dear. Any chance I can find out which file is affected? – Axel dabee Feb 05 '17 at 08:45
  • What is the url of the repo you are cloning? – VonC Feb 05 '17 at 09:26
  • It's a private repo on Visualstudio.com, but I cloned it already a couple times in the past – Axel dabee Feb 05 '17 at 09:27
  • Did that repo use git lfs (which VisualStudio.com does support: https://www.visualstudio.com/en-us/docs/git/manage-large-files), as recommended in http://stackoverflow.com/q/18225126/6309? – VonC Feb 05 '17 at 09:28
  • Nope, we didn't set that up properly. I guess it's too late now for that is it? – Axel dabee Feb 05 '17 at 09:37
  • @Axeldabee No you can convert an existing one in order to use LFS: https://confluence.atlassian.com/bitbucket/use-bfg-to-migrate-a-repo-to-git-lfs-834233484.html. Then I would suggest to push to a new private repo. – VonC Feb 05 '17 at 09:40