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.

Sign up for GitHub

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

Jump to bottom

dev/core#4127 move standalone profile modification to userSystem #25574

Merged
merged 1 commit into from
Mar 3, 2023
Merged

dev/core#4127 move standalone profile modification to userSystem #25574

merged 1 commit into from
Mar 3, 2023

Conversation

herbdool
Copy link
Contributor

@civibot
Copy link

civibot bot commented Feb 14, 2023

No issue was found matching the number given in the pull request title. Please check the issue number.

@civibot
Copy link

civibot bot commented Feb 14, 2023

(Standard links)

@civibot civibot bot added the master label Feb 14, 2023
@eileenmcnaughton
Copy link
Contributor

test fail is a style warning
image

@herbdool
Copy link
Contributor Author

Fixed the style. It will need a squash during merging.

@eileenmcnaughton
Copy link
Contributor

@herbdool we actually disabled the ability to squash during merging - it isn't great froma commit history point of view

@herbdool
Copy link
Contributor Author

@eileenmcnaughton okay, I'll do a force push. I'm used to the Backdrop workflow on github, where we always squash PRs when merging. I haven't noticed any difference between the two since it just shows up as one commit per PR in the main branch.

@eileenmcnaughton
Copy link
Contributor

@herbdool yeah - if you squash you get one commit, otherwise you get 2 with the difference between the merge commit & the non-merge commit clear & no 'leakage' of committer from merger

@herbdool
Copy link
Contributor Author

It's ready again.

@herbdool
Copy link
Contributor Author

test this please Jenkins

@demeritcowboy demeritcowboy merged commit e06ae3e into civicrm:master Mar 3, 2023
@herbdool herbdool deleted the core-4127-5 branch March 3, 2023 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@demeritcowboy demeritcowboy demeritcowboy left review comments

Assignees
No one assigned
Labels
master merge on pass
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@herbdool @eileenmcnaughton @demeritcowboy