GitHubLionel / wxMathPlot

An enhanced version of the wxMathPlot component for wxWidgets
14 stars 5 forks source link

Ouch! Careful with the auto-format! #35

Closed DRNadler closed 3 months ago

DRNadler commented 3 months ago

I just tried to merge a bunch of documentation corrections and minor touchups. The merge failed because the code I recently added (bounding box stuff) had been reformatted. It looks like some auto-reformatting happened somewhere. In addition to making the code much harder to read, now the merge fails...... Ouch!

asmwarrior commented 3 months ago

You mean some code are using "two spaces" as indent, but some code are using "one tab" as indent char? Maybe some are using "4 spaces" as intent char.

DRNadler commented 3 months ago

In your latest commit, the bounding box functions I added were reformatted into many more lines. This unfortunately made the git merge function fail when I try to commit my latest changes. I'm trying to stick with the original code style which seemed to use spaces not tabs and often indented in multiple of 2 spaces. Unfortunately source indenting is quite random now?

GitHubLionel commented 3 months ago

The format I use is :

DRNadler commented 3 months ago

I had to delete my fork and create a new one to be able to merge...