Closed JessePeden closed 1 month ago
This is a merge conflict generated by the git client. I'll see what we can do about that but it's less about the splatting change and more about the changes on the remote vs the local repo.
This is a merge conflict generated by the git client. I'll see what we can do about that but it's less about the splatting change and more about the changes on the remote vs the local repo.
Whatever it is, it only seems to have happened when CFS was turned on and at the next change to a configuration file, and it causes PSU to freak out.
What likely happened was that the file was updated then the git client did a pull from the remote and updated the file with the merge conflict. You have automatic mode on for git, right?
Either way, PSU should handle this more gracefully...
You have automatic mode on for git, right?
Yes.
Version
5.0.7
Severity
Critical
Environment
msi
Steps to Reproduce
Expected behavior
Actual behavior
Example
This is an example of my scripts.ps1 file after enabling Configuration File Splatting:
Additional Environment data
No response
Screenshots/Animations
No response