The only thing I changed was an environment file.
Discussion
When i do a reset to head, stash, and try to pull again it says i need to fix merge conflitcs.
The only thing I changed was an environment file.
When i do a reset to head, stash, and try to pull again it says i need to fix merge conflitcs.