#28 Resolve conflicts about csvanalyzerpro

[ealvesss]

which conflict?

[hunbernd]

I give it a try, please check this version: https://github.com/hunbernd/CSVAnalyzerPro
If it is working for you, then I can give you instructions, how to fix your repo.

[CoderJoeW]

Here's an image

https://ibb.co/bEHgAm

[hunbernd]

You cannot merge these files on github easily, you should merge them locally on your computer and push the merge commit.
You will need a tool, I suggest Tortoisegit, or Meld.

The deleted and then uploaded files just make git confused, I suggest to remove this commits first and then attempt to merge again.

[CoderJoeW]

Yeah never ran across the issue before I will revert the latest commits and then try one of those tools