Routeplanning #28
Routeplanning #28
Conversation
Resolved Conflicts: src/undo.cpp
|
You're making it hard both to do code review and to merge it later by having so many commits. You need to squash all your commits together into one, which has an appropriate name describing the features itimplements. See http://stackoverflow.com/questions/5189560/how-can-i-squash-my-last-x-commits-together-using-git |
|
ok. thnx for reply. i meet git only in this project (we use svn at work) and i don't know the policy of opencpn community, so, it is clear, that i need guide how to do it properly.i apply advices from the ur link and contact you again.Cheers,Pavel You need to squash all your commits together into one, which has an appropriate name describing the features itimplements. See http://stackoverflow.com/questions/5189560/how-can-i-squash-my-last-x-commits-together-using-git |
|
Hi, Jesperlook.With my subversion experience, i do regular "git pull upstream master" to update my repository with the idea that "diff" between OpenCPN/OpenCPN/master and my registry/OpenCPN shows only my contribution.Is it wrong approach in git?My last commits are nothing else than this merges.... Might it be, that i don't need to do it in the case of git?Cheers,Pavel You need to squash all your commits together into one, which has an appropriate name describing the features itimplements. See http://stackoverflow.com/questions/5189560/how-can-i-squash-my-last-x-commits-together-using-git |
|
No your idea that "that diff between OpenCPN/OpenCPN/master and my registry/OpenCPN shows only my contribution" is absolutely fine. But your pull request is not that diff. It is 9 different diff's in 9 different commits. This makes it very hard to review your code, because there is not one place where we can see all the changes. What you need to do is create another branch, and merge those 9 commits into a single one, and then push that branch and do a pull request on it. |
|
Hi Jesper,well, i think now i've done it correctly.Although, i made mistake by the naming of the new pull request. Recent pull request would be "Squashing all commits for pull request." (didn't notice, that name of the pull request is wrong)Pull request "Routeplanning" should be removed. And i dont know how to do that.I squashed all commits. I hope, this time it is ok.If not - tell me.Cheers,Pavel. But your pull request is not that diff. It is 9 different diff's in 9 different commits. This makes it very hard to review your code, because there is not one place where we can see all the changes. What you need to do is create another branch, and merge those 9 commits into a single one, and then push that branch and do a pull request on it. |
Updates for OSX plugin user data location change for OS4.1
60bc11e replace isnan with wxIsNaN c++11 madness 0fbdf42 On windows use a private name for our bzip static library abc27a9 tidier layout, first try e68b2e2 bump version for release b5fc690 Merge pull request OpenCPN#34 from Hakansv/po 08a96fd Translations 2018-03 5362621 Add build to gitignore 5038d23 Merge pull request OpenCPN#33 from stelian42/fix-units-crash-and-translations f36c80e Fix crash due to missing unit names in global table 8e0614e Fix units combobox translations 5d234dd Merge pull request OpenCPN#32 from nohal/master 5d008e4 Return .${VERSION_PATCH} to version number b586557 Fix tr translation to compile 3a4802a CI 5e03179 Translations 212da14 Update the translation template 1d31871 Allow forcing the used wxWidgets version. 31dd96e Merge pull request OpenCPN#31 from nohal/master 6e81867 Update the compilation flags b831f9b Merge branch 'master' of github.com:seandepagnier/climatology_pi 5c29c8b implement better precipitation units 3d12762 Merge pull request OpenCPN#28 from nohal/master 396a1ab Implement SVG icons for improved high resolution display support. Also fix macOS build and packaging. ae8abd7 Merge pull request OpenCPN#27 from nohal/master da3a5a9 Fix in-the-tree build on macOS, fix window order on macOS, improve missing data dialog layout. REVERT: e1c0dd3 On windows use a private name for our bzip static library REVERT: 9559d93 tidier layout, first try git-subtree-dir: plugins/climatology_pi git-subtree-split: 60bc11e11c2c1dff12724d3f51ecdc8512bc6763
Hi all,
here is an extension of the route properties dialogue with the new button "Print route" and printing it in the table form.
This extension is needed for long time trips, where commander provides a route description for the watch officer ( if possible - in paper form ) with the WP cross check instructions, next course, distance and specific notes for the next leg of the route.