search

GitFiend / Support

Public repo for GitFiend questions and issues
118 stars 7 forks source link

bug?: merge removes the empty line at the end of file #209

Open damies13 opened 1 month ago

damies13 commented 1 month ago

I've had this happen a few times when merging branches and there is a file conflict, I use the merge tool in gitfiend and when I push the changes I get a linter error because the empty line at the end of the file is missing.

PYTHON_FLAKE8
  2024-10-19 00:28:21 [INFO]   Linting PYTHON_FLAKE8 items...
  Error: -19 00:28:28 [ERROR]   Found errors when linting PYTHON_FLAKE8. Exit code: 1.
  2024-10-19 00:28:28 [INFO]   Command output for PYTHON_FLAKE8:
  ------
  /github/workspace/rfswarm_reporter/rfswarm_reporter.py:11469:25: W292 no newline at end of file
  ------

It took me a while to realise it's gitfiend doing this.

This issue is a minor inconvenience type bug, but it would be nice if it's fixed eventually.

damies13 commented 1 month ago

version 0.45.3

GitFiend commented 1 month ago

Thanks. This will be fixed in the next release.