search

LightBuzz / Vitruvius

A set of easy-to-use Kinect utilities that will speed-up the development of your projects.
http://vitruviuskinect.com
Apache License 2.0
229 stars 82 forks source link

KinectViewer bug fix, Resizable Test project UI, Using KinectViewer at Test Project #12

Closed birbilis closed 8 years ago

birbilis commented 8 years ago

(UPDATE: fixed the merge conflict with Readme.md file from my side) Probably the edit to README.md cause the Merge Conflict it says above. GitHub should be showing you some instructions on how to resolve this manually. I have tried to repeat the change you did to README.md at my repo in case it helps with the merging

birbilis commented 8 years ago

note that I have also done a bug fix to KinectViewer control (for Kinect v1) in this bunch of changes. It was in the SizeChanged event handler. Maybe the Kinect v2 and WinRT versions need similar change if they have the same control, haven't checked yet since I don't have the Kinect v2

birbilis commented 8 years ago

You can now pull the above changes automatically, since I've managed to resolve the Merge conflict by creating a Pull Request from your repo to mine (telling GitHub to compare forks instead of branches after pressing Pull Request at your repo) and then at command line in my repo did the steps GitHub site suggested, with some guesswork in between (writing down here in case I come across this again):

git checkout -b LightBuzz-master master git pull https://github.com/LightBuzz/Vitruvius.git master

git commit -am "merged Readme.md" (it wasn't suggesting this, but was needed since it was failing to automerge although our Readme.md files were identical after I had manually done and pushed the same change you had done to it)

git checkout master git merge --no-ff LightBuzz-master git push origin master