Jump to content

iniside

Members
  • Posts

    6
  • Joined

  • Last visited

Recent Profile Visitors

The recent visitors block is disabled and is not being shown to other users.

iniside's Achievements

Newbie

Newbie (1/14)

0

Reputation

  1. Hey Aftering looking at it again it might work. I just miss understood how it works. it's Cherry pick from.. while (to the branch I'm currently on), while for some reason I thought it will always from bottom up. It seems it work now. Though it will be nice to also have similiar option like cherry pick to.
  2. I might be doing it wrong but.. Here is my setup. I Have single /main branch where I keep game engine files. I have child branch /main/Projects - here I keep engine level plugins, which do not belong to vanillia engine, but I want to share for every project. At least I have /main/Projects/ProjectName - branch specific per project. Now I created another branch from /main/Projects/ProjectName/Engine-Plugin-Refactor I made some changes to plugins shared across all game projects. I want it to merge back to /main/Projects. But when trying merge to - it also wants to merge all the game project files, which is not something I want. Is there way to merge only the files I want, back to /main/Projects ? Or is there some branching setup which would allow me to do it ? The one work around I have for now is to force conflict on folders I don't want to merge, while not perfect it somewhat works.
  3. Here is what I have done: 1. Cloned single (master) branch of unreal engine. 2. Hosted local server for git using git daemon. 3.Created local Plastic repository. 4. Tried to sync local git repo. There were about 144000 objects to import. After 8 hours it imported only 55000, and slowed to the point where it imported 1-2 objects per 30 seconds. Cloud you guys try to import unreal engine on your end ? Small or less complex repositories import without problem.But something of the unreal size is literaly impossible, and you can't continue importing if something broken, you have to start from scratch.
×
×
  • Create New...