Your changes were merged in but not with the proper commit level tracking so this PR is still open. I tried to merge your PR without including the frx files. I guess I did it (partially) wrong.
The frx files really don't matter to me (whether they are included in commits or not). I was trying out some Git commands to see what was possible to prevent them from changing on merges.
I think I should have merged your branch in as-is and then have done another commit that reverted those frx files back to the version I wanted. The net result would be no change on the frx files (in the data sense) but with an extra commit in the middle to undo them.
That looks just as noisy to me, so then I tried to cherry pick the source files that changed. This worked, but since I did individual files it has no memory that I took them from your PR. I did the cherry-picking business with Smart Git so I did not see the actual Git commands it ran. I don't think it actually used the cherry-pick command since that is commit based. I think it just pulled the changes into the local master branch from your PR branch.
If you have an opinion about any of this (or better Git knowledge), let me know. If you're fine with how things worked out here, I'll close the PR. In the future, I'll just do the merge and not worry about frx files (or anything else that didn't actually change).
Your changes were merged in but not with the proper commit level tracking so this PR is still open. I tried to merge your PR without including the frx files. I guess I did it (partially) wrong.
The frx files really don't matter to me (whether they are included in commits or not). I was trying out some Git commands to see what was possible to prevent them from changing on merges.
I think I should have merged your branch in as-is and then have done another commit that reverted those frx files back to the version I wanted. The net result would be no change on the frx files (in the data sense) but with an extra commit in the middle to undo them.
That looks just as noisy to me, so then I tried to cherry pick the source files that changed. This worked, but since I did individual files it has no memory that I took them from your PR. I did the cherry-picking business with Smart Git so I did not see the actual Git commands it ran. I don't think it actually used the
cherry-pick
command since that is commit based. I think it just pulled the changes into the local master branch from your PR branch.If you have an opinion about any of this (or better Git knowledge), let me know. If you're fine with how things worked out here, I'll close the PR. In the future, I'll just do the merge and not worry about frx files (or anything else that didn't actually change).