search

tsdconseil / opencv-demonstrator

OpenCV demonstrator (GUI)
http://www.tsdconseil.fr/log/opencv/demo/index-en.html
GNU Lesser General Public License v3.0
141 stars 57 forks source link

There is something strange with the last commits #21

Closed juliena82 closed 8 years ago

juliena82 commented 8 years ago

@valera-rozuvan When you look at https://github.com/tsdconseil/opencv-demonstrator The last commit say "Merge branch 'master' of github.com:tsdconseil/opencv-demonstrator", and not what you have just done. And when we click on this commit, we see the modifications that I had done, but as if you had done it. And just before, when I commited, it was the same, in the reverse direction. Haven't we some kind of branch problem? Have you created a branch?

valera-rozuvan commented 8 years ago

Sorry. I should have linked to the commit 8fdcf8d0676495eb7379af9d1659855854276018 = ) It's just that you committed something, and I had to merge your new changes with my new commit. It's how Git works.

valera-rozuvan commented 8 years ago

@juliena82 Please take a look at https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging for some theory about Git merges.

valera-rozuvan commented 8 years ago

Anyways, doc/build-instructions.md looks right to me = )

juliena82 commented 8 years ago

Yes it's perfect now!

applemuncy commented 8 years ago

Greetings, @juliena82 @valera-rozuvan , seems to me there needs to be a branches.md in /doc that details where work and testing takes place before merging. I'm definitely a beginner at understanding how to use github with git locally safely.

Including the link above would be good.

I'll try to submit something soon.

juliena82 commented 8 years ago

@applemuncy +1 Yes good idea. I am myself a beginner at GitHub (I used to use only SVN before, and GIT is definitivly more sophisticated). So creating a document for how we will use branches (and with links to docs) is a good thing to do.