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

[16.0][IMP] sale_order_line_menu : improve Readme #3313

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

TumbaoJu
Copy link
Contributor

Improve Description and Usage
Add Context

@TumbaoJu
Copy link
Contributor Author

@OCA/oca-consultants : Here is the example used for the Guidelines.

@TumbaoJu
Copy link
Contributor Author

@sbidoul : I seem to have a problem with the images. I did the drag & drop into the static/description folder in my forked repository and did the commit and PR. But is does not work. Any ideas?

@rousseldenis
Copy link
Sponsor Contributor

@sbidoul : I seem to have a problem with the images. I did the drag & drop into the static/description folder in my forked repository and did the commit and PR. But is does not work. Any ideas?

@TumbaoJu It seems ok:

image

Copy link
Sponsor Contributor

@rousseldenis rousseldenis left a comment

Choose a reason for hiding this comment

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

LGTM.

Can you squash your commits ?

@vdewulf
Copy link

vdewulf commented Sep 16, 2024

Hi @rousseldenis

Thanks for your help, as usual!

Thanks to your request, I'll finally discover what it this "squash your commits" phase. I read about it here:
https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests
It explains how to do it with terminal interface (I suppose).

I am not sure @TumbaoJu is using a terminal. Is there a way to squash commits using the Graphical interface on Github?
I found this Github official doc:
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges

I couldn't spend too much time here, so I'll let Julie follow up and indicate if she found the way to "squash her commits".
Curious to see the next steps!

@rousseldenis
Copy link
Sponsor Contributor

Hi @rousseldenis

Thanks for your help, as usual!

Thanks to your request, I'll finally discover what it this "squash your commits" phase. I read about it here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests It explains how to do it with terminal interface (I suppose).

I am not sure @TumbaoJu is using a terminal. Is there a way to squash commits using the Graphical interface on Github? I found this Github official doc: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges

I couldn't spend too much time here, so I'll let Julie follow up and indicate if she found the way to "squash her commits". Curious to see the next steps!

Indeed, this is not available through Github web interface.

But, I've discovered Github desktop for Windows/Mac that offers that command in a graphical interface : https://github.com/apps/desktop

@TumbaoJu Maybe you can give a try following these instructions ?

https://docs.github.com/en/desktop/managing-commits/squashing-commits-in-github-desktop

@pedrobaeza
Copy link
Member

I think that using VSCode integration in GitHub may help for amending commits. Just type . when browsing code to enter VSCode.

@rousseldenis
Copy link
Sponsor Contributor

I think that using VSCode integration in GitHub may help for amending commits. Just type . when browsing code to enter VSCode.

I think that using VSCode integration in GitHub may help for amending commits. Just type . when browsing code to enter VSCode.

Ooooh yes, I forgot that.

@TumbaoJu
Copy link
Contributor Author

TumbaoJu commented Sep 16, 2024

@rousseldenis @pedrobaeza : Thank you both for your comments.
I did this contribution as an example to be able to explain how to contribute to modules documentation if you are a non-technical person.

In the instructions, we are using the web editor (VS Code) to commit, but I did'nt know how to create the PR and or squash the commits using the VS Code interface.

I will look into the documentation @vdewulf proposed and try to do it.

@TumbaoJu
Copy link
Contributor Author

@rousseldenis @pedrobaeza : I have looked into it and don't know how to squash the commits even with the VS Code interface.
I would need help!

@pedrobaeza
Copy link
Member

Right now is not possible. What I said is that when committing more changes, instead of creating a new commit, is to mark to amend previous commit, so everything sticks together since the beginning.

@gurneyalex
Copy link
Member

Could we not use the squash and merge feature for this? Maybe we could have the ocabot perform this through a dedicated command ("ocabot squash merge patch" for instance) ?

@TumbaoJu
Copy link
Contributor Author

TumbaoJu commented Sep 17, 2024

Could we not use the squash and merge feature for this? Maybe we could have the ocabot perform this through a dedicated command ("ocabot squash merge patch" for instance) ?

I like this proposition. The idea is attract non-technical persons to contribute to module documentation so if we can ease the process for Read Me updates it could be great.

@sbidoul : FYI

Copy link

@florenciafrigieri2 florenciafrigieri2 left a comment

Choose a reason for hiding this comment

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

Changes in readme ok

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

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

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 16.0-ocabot-merge-pr-3313-by-etobella-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit eb2e7c9 into OCA:16.0 Sep 30, 2024
9 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 3704f72. Thanks a lot for contributing to OCA. ❤️

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.

8 participants