search

arrayfire / arrayfire-dotnet

.NET wrapper for ArrayFire
BSD 3-Clause "New" or "Revised" License
78 stars 21 forks source link

Added UnitTest project #13

Closed Oceania2018 closed 5 years ago

Oceania2018 commented 5 years ago
  1. Add FSharp example project back and upgrade to .net core 2.2.
  2. reorganize file structure.
  3. add UnitTest project
9prady9 commented 5 years ago

@Oceania2018 I think you didn't rebase it correctly, can you please fix that.

Oceania2018 commented 5 years ago

@9prady9 It's working now.

9prady9 commented 5 years ago

Hm, the rebase/merge button is still disabled on github, are you sure ?

Oceania2018 commented 5 years ago

@9prady9 rebased

9prady9 commented 5 years ago

@Oceania2018 Now there are duplicate commits if I am not wrong. I am not sure how you are rebasing but there is a merge commit in this PR. I think your local branch was checked out from earlier master HEAD and not the updated one.

Oceania2018 commented 5 years ago

@9prady9 Yes, I didn't sync before I commit. I synced it later and resolved the conflicts. My devel branch should be the right one. You can merge safe.

9prady9 commented 5 years ago

Sorry to say again, but the commit history is not correct. Please look at the screenshot of github commit list of this PR. screenshot from 2019-02-06 16-56-52

Oceania2018 commented 5 years ago

OK, I'll redo. close this PR.

9prady9 commented 5 years ago

Please make sure the new branch you create is based of latest devel(arrayfire/arrayfire-dotnet).

Oceania2018 commented 5 years ago

I delete my repo and fork again, so everything should be working.

9prady9 commented 5 years ago

Yup, I saw the new PR and looks good, will merge it soon.