search

DTUWindEnergy / BasicDTUController

This repository is no longer being updated, and has been moved to DTU Wind Energy's GitLab server: https://gitlab.windenergy.dtu.dk/OpenLAC/BasicDTUController
GNU General Public License v3.0
23 stars 23 forks source link

Update 'get_git_version.bat' to generate 'git_version.inc' #16

Closed jantoreh closed 7 years ago

jantoreh commented 7 years ago

Proposed solution to avoid using 'VersionScript' to generate 'git_version.inc'. This eliminates the need for 'VersionScript.exe'. Found to be working well.

davidovitch commented 7 years ago

@jantoreh thanks for these PR's! We'll have a look at them very soon!

jantoreh commented 7 years ago

Great! I see that all commits ended up here, but only no. ddaf48 was ment for this specific PR. The others either have their own PR, unless they are changes specific for my own use.

fzahle commented 7 years ago

in that case you need to close this PR and make a new branch from the master branch and then cherry-pick that specific commit from your patch-5 branch.

fzahle commented 7 years ago

also, in my experience its not a good idea to make commits to your own master branch since this is now diverged from the origin's master. don't know whether there's a neat way to clean up your own master, but otherwise I'd delete your fork, fork again, and then re-push whatever branches you want to keep form your local checkout. just a suggestion.

jantoreh commented 7 years ago

Ok, thanks. I will clean up and delete this request shortly.

jantoreh commented 7 years ago

New PRs are made. Will not make my own branch until you have considered them.