search

antonmks / Alenka

GPU database engine
Other
1.17k stars 120 forks source link

refactoring + code formatting + test data #94

Closed hurdad closed 8 years ago

antonmks commented 8 years ago

There are conflicts in 2 files : CONFLICT (content): Merge conflict in src/Makefile Auto-merging moderngpu Adding as moderngpu~c9c8ce6f31d383c1b27a6cccb6778baba8bc1797 instead

Not sure what to do about them - could you fix it somehow ?

hurdad commented 8 years ago

So I tried to sync with your latest updates but I am getting errors..

First issue has to do with the Makefile update you did recently regarding the bison.xx , that needs to be completely overwritten, as i changed name of the name to alenka.xx ...

The other issues has to do with moving the 'moderngpu' submodule to the root directory.

If you give me write access, I might be able to fix the conflicts..

-alex

antonmks commented 8 years ago

Ok, I added you. See if that works ...

On Thu, Apr 14, 2016 at 5:24 PM, Alexander Hurd notifications@github.com wrote:

So I tried to sync with your latest updates but I am getting errors..

First issue has to do with the Makefile update you did recently regarding the bison.xx , that needs to be completely overwritten, as i changed name of the name to alenka.xx ...

The other issues has to do with moving the 'moderngpu' submodule to the root directory.

If you give me write access, I might be able to fix the conflicts..

-alex

— You are receiving this because you commented. Reply to this email directly or view it on GitHub https://github.com/antonmks/Alenka/pull/94#issuecomment-209968495

hurdad commented 8 years ago

ok, I will give this a try after lunch. thanks