Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
threads settings for zero profile case
- Loading branch information
1 parent
a1f7dc3
commit 8df1a2b
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@BenjaminTJohnson is this what caused the conflict with my PR? The git history shows many changes but none of them is real - like a space was deleted then added and so on. So git cannot resolve the differences.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@BenjaminTJohnson Here is a screen shot and as you see all the changes marked by Girhub are deleting and adding spaces. It is likely that the editor used to edit the file treated spaces differently and git interpreted them as changes.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@imoradi, no, the editor didn't treat spaces differently. It removed unnecessary spaces (end of the line, empty lines, etc.). But please, notice that what might be causing a conflict with your PR is the addition of the zero profile case. Please, search for something like
n_Profiles == 0and you will see the changes around that.8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I saw the n_Profiles == 0 but Git blocks big chunks of the code as conflict and not even properly grouping them together which makes it difficult to resolve the conflicts. I may have to use some offline tools to see where the actual differences are. Thanks anyway for your comment. Good to know that these are real changes.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@imoradi seems to me that your version of the code fixed the indentation throughout the code and that's what confused things in the interface.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume the PR you are talking about is #39.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems to me that your version of the code is only missing that
n_Profiles == 0and the addition ofOptinPost_Process_RTSolution(Opt,....8df1a2bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @fabiolrdiniz - I made a new branch this morning and I believe have moved all the changes from my branch to the new one that matches Develop. I need to do some tests and if it passes then will make a new PR.