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

Add ignoreConflicts parameter to paket push #2720

Merged

Conversation

gdziadkiewicz
Copy link
Contributor

@gdziadkiewicz gdziadkiewicz commented Nov 15, 2022

Description

Add missing parameter ignoreConflicts from paket push

TODO

Feel free to open the PR and ask for help

  • New (API-)documentation for new features exist (Note: API-docs are enough, additional docs are in help/markdown)

  • unit or integration test exists (or short reasoning why it doesn't make sense)

    Note: Consider using the CreateProcess API which can be tested more easily, see https://github.com/fsharp/FAKE/pull/2131/files#diff-4fb4a77e110fbbe8210205dfe022389b for an example (the changes in the DotNet.Testing.NUnit module)

  • boy scout rule: "leave the code behind in a better state than you found it" (fix warnings, obsolete members or code-style in the places you worked in)

  • (if new module) the module has been linked from the "Modules" menu, edit help/templates/template.cshtml, linking to the API-reference is fine.

  • (if new module) the module is in the correct namespace

  • (if new module) the module is added to Fake.sln (dotnet sln Fake.sln add src/app/Fake.*/Fake.*.fsproj)

  • Fake API guideline is honored

@gdziadkiewicz gdziadkiewicz force-pushed the Add_paket_push_ignoreConflicts branch from 6191793 to 651bbd6 Compare November 15, 2022 10:08
@yazeedobaid
Copy link
Collaborator

Thanks for contributing. Could you please rebase your branch from master? We have fixed the failing build.
Also, could you please provide a description of the PR?

@gdziadkiewicz
Copy link
Contributor Author

gdziadkiewicz commented Nov 18, 2022 via email

@gdziadkiewicz gdziadkiewicz force-pushed the Add_paket_push_ignoreConflicts branch from 651bbd6 to 449e99d Compare November 20, 2022 23:43
@gdziadkiewicz
Copy link
Contributor Author

Refreshed the branch with master and added a description. I will do some more testing and provide the test results here before progressing from draft.

@gdziadkiewicz gdziadkiewicz force-pushed the Add_paket_push_ignoreConflicts branch from d42a4f8 to 7531ac8 Compare December 19, 2022 21:53
@gdziadkiewicz gdziadkiewicz marked this pull request as ready for review December 19, 2022 21:54
@yazeedobaid yazeedobaid merged commit 4b53a2d into fsprojects:master Dec 21, 2022
@gdziadkiewicz gdziadkiewicz deleted the Add_paket_push_ignoreConflicts branch December 21, 2022 09:52
@yazeedobaid
Copy link
Collaborator

Thanks! Released in 6.0.0-beta001

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