Project

General

Profile

Actions

Architecture #8126

closed

Remove trailing space in code file that make merge conflicts

Added by François ARMAND about 5 years ago. Updated about 5 years ago.

Status:
Released
Priority:
2
Category:
Architecture - Refactoring
Target version:
Effort required:

Description

As we still don't have a linter, we have a lot of files with tailing spaces which cause a huge amount of conflicts in space-unsenstive code file (scala, html, css, js, etc).

We just need to take it down one time for all, and add a linter + git pre-commit hook to take of the solution on the long run.

For now, I'm only taking care of scala project, where there is the more such problem, and the less risk to touch space-sensitive files.

It need to be done in each project, and the merge to hight branch will need to be done with care.


Subtasks 5 (0 open5 closed)

Architecture #8128: Remove trailling whitespace - parent-pomReleasedNicolas CHARLES2016-03-31Actions
Architecture #8129: Remove trailling whitespace - rudder-commonsReleasedNicolas CHARLES2016-03-31Actions
Architecture #8130: Remove trailling whitespace - scala-ldapReleasedNicolas CHARLES2016-03-31Actions
Architecture #8131: Remove trailling whitespace - ldap-inventoryReleasedNicolas CHARLES2016-03-31Actions
Architecture #8132: Remove trailling whitespace - cf-clerkReleasedNicolas CHARLES2016-03-31Actions
Actions #1

Updated by François ARMAND about 5 years ago

This one is for rudder repos.

Actions #2

Updated by François ARMAND about 5 years ago

  • Status changed from In progress to Pending technical review
  • Assignee changed from François ARMAND to Nicolas CHARLES
  • Pull Request set to https://github.com/Normation/rudder/pull/1072
Actions #3

Updated by François ARMAND about 5 years ago

  • Status changed from Pending technical review to Pending release
Actions #4

Updated by Vincent MEMBRÉ about 5 years ago

  • Status changed from Pending release to Released

This bug has been fixed in Rudder 2.11.20, 3.0.15, 3.1.9 and 3.2.2 which were released today.

Actions

Also available in: Atom PDF