Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GT-172] Add blank line across the codebase for PHP files #457

Merged

Conversation

Sae126V
Copy link
Contributor

@Sae126V Sae126V commented Jun 20, 2023

Adding a single empty Line across the codebase at the EOF. There won't be any impact in-terms of functionality or behaviour. This change applies ONLY to the codebase.

"Please feel free to give any thoughts or comments on this" ---

"Resolves GT-172"

@Sae126V Sae126V requested a review from a team as a code owner June 20, 2023 13:50
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch from fc04612 to 40e8919 Compare June 20, 2023 14:28
Copy link
Member

@gregcorbett gregcorbett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a minor thing we a strange character.

@gregcorbett gregcorbett self-assigned this Aug 14, 2023
@Sae126V Sae126V requested a review from gregcorbett August 15, 2023 08:06
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch from 66ad0f6 to 6dc243f Compare August 17, 2023 10:08
@Sae126V Sae126V marked this pull request as draft August 17, 2023 10:09
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch 2 times, most recently from 40942ad to 40e8919 Compare August 17, 2023 10:25
@Sae126V Sae126V marked this pull request as ready for review August 17, 2023 10:28
@gregcorbett
Copy link
Member

Can you rebase this ontop of the latest dev? That should remove the strange character change, as that has been merged in (see #471) separately.

@gregcorbett gregcorbett added this to the May 2023 milestone Aug 21, 2023
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch from f50e3a9 to 40e8919 Compare August 21, 2023 17:04
@gregcorbett
Copy link
Member

Looks like you'll need to update your local copy of the upstream dev branch and rebase again - there's still conflicts.

@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch 5 times, most recently from 008191b to 16de44e Compare August 22, 2023 13:58
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch 2 times, most recently from b882bf2 to 92a011b Compare September 7, 2023 09:43
@Sae126V Sae126V force-pushed the feature/Add-a-blank-line-across-codebase branch from 92a011b to 8f7606b Compare September 7, 2023 09:45
@gregcorbett
Copy link
Member

gregcorbett commented Sep 7, 2023

I've documented the fix to the weirdness here: https://stfc.atlassian.net/wiki/spaces/GTT/pages/160170035/GOCDB+Developement#Troubleshooting, as this isn't the first time we have seen it (#447 (comment)).

@Sae126V
Copy link
Contributor Author

Sae126V commented Sep 7, 2023

Rebased and verified.

Copy link
Member

@gregcorbett gregcorbett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me :)

@gregcorbett gregcorbett merged commit b8a0e5f into GOCDB:dev Sep 7, 2023
6 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants