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

Documented: Simple production setup+quick refinements #874

Merged
merged 14 commits into from
Jan 25, 2025

Conversation

grozadanut
Copy link
Contributor

Documented: Simple production setup+quick refinements

@JacquesLeRoux
Copy link
Contributor

Hi @grozadanut,

I tried to apply your patch and got this

C:\projectsASF\Git\ofbiz-framework>git apply 874.patch
874.patch:112: trailing whitespace.

error: patch failed: framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java:251
error: framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java: patch does not apply
error: framework/common/data/GeoData_RO.xml: already exists in working directory
error: patch failed: framework/common/ofbiz-component.xml:56
error: framework/common/ofbiz-component.xml: patch does not apply

After removing the unecessary parts I got no problem.

@JacquesLeRoux JacquesLeRoux merged commit 4bdca76 into apache:trunk Jan 25, 2025
7 checks passed
@JacquesLeRoux
Copy link
Contributor

Thanks !

@grozadanut
Copy link
Contributor Author

Might be because my trunk fork appears to be 14 commits ahead of the source repository. I think it's some kind of git issue. I might need to rebase my repo on the official trunk version or something... I'll try some git commands when I get the chance.

@JacquesLeRoux
Copy link
Contributor

Yes, not a big deal this time, sometimes it's more difficult.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants