Closed mortezah closed 4 years ago
Looks good at first glance. I'll take a closer look tomorrow.
Please add any new source files to the pkg_tribits.cmake
files in each directory.
@cwsmith the new source are in the pkg_tribits.cmake
@cwsmith
Do you know when this would be merged? A student I am working with will need these changes for his development.
Sorry for the delay. I'll look in about an hour.
@cwsmith thanks for the reviews. I am going to merge this shortly if there are no more issues. Github has a few options
Which one is the suggested method?
You're welcome.
The answer depends on what history (sequence of commits) you want to exist in develop after the merge.
merge commit
will add the sequence of commits from the PR to develop + a 'merge' commit. squash and merge
will combine ('squash') all the commits from this PR into a new commit and add it and a 'merge' commit into develop.rebase and merge
will squash the commits and add that commit onto developThis appears like a decent, deeper, explanation of the differences: https://rietta.com/blog/github-merge-types/
@cwsmith thanks.
I will do the merge commit, since I will need to refer to some of the commits (for code style and development purposes) when I work with the students.
This pull request achieves the following