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 ability to pull before push #23

Merged
merged 3 commits into from
Apr 17, 2024

Conversation

flxdot
Copy link
Contributor

@flxdot flxdot commented Sep 28, 2023

Fixes #13.

Since #14 seems to be stalled.

I took the idea and added the ability to opt-in for the pull before merge.

Copy link

@EdEngineering EdEngineering left a comment

Choose a reason for hiding this comment

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

nice

@flxdot
Copy link
Contributor Author

flxdot commented Dec 5, 2023

ping @devenes / @notfilippo

@devenes
Copy link
Contributor

devenes commented Dec 5, 2023

Hi @flxdot,

I believe adding this feature would be very beneficial. However, it's crucial to consider a significant distinction: the difference between git pull and git pull --rebase commands.

My suggestion is to choose a term that users can easily comprehend while integrating this feature. For instance, naming the input as rebase could provide a clearer expression of the project update strategy. Otherwise, new users who haven't delved into the detailed documentation might mistakenly assume that the pull input is necessary for git pull and without it, the code won't check out. This could lead to confusion among users.

Therefore, to adopt a user-friendly approach, I propose naming the input rebase. This term is more specific to the update process and can transparently communicate to users which strategy is being employed.

@flxdot
Copy link
Contributor Author

flxdot commented Dec 6, 2023

I agree.

@flxdot
Copy link
Contributor Author

flxdot commented Dec 6, 2023

Since I can't request your review directly @devenes I'll just ping you here again :)

@flxdot flxdot mentioned this pull request Jan 2, 2024
@flxdot flxdot requested a review from EdEngineering January 17, 2024 13:25
@flxdot
Copy link
Contributor Author

flxdot commented Jan 17, 2024

Hi @flxdot,

I believe adding this feature would be very beneficial. However, it's crucial to consider a significant distinction: the difference between git pull and git pull --rebase commands.

My suggestion is to choose a term that users can easily comprehend while integrating this feature. For instance, naming the input as rebase could provide a clearer expression of the project update strategy. Otherwise, new users who haven't delved into the detailed documentation might mistakenly assume that the pull input is necessary for git pull and without it, the code won't check out. This could lead to confusion among users.

Therefore, to adopt a user-friendly approach, I propose naming the input rebase. This term is more specific to the update process and can transparently communicate to users which strategy is being employed.

@devenes it's done

@flxdot
Copy link
Contributor Author

flxdot commented Apr 17, 2024

@devenes / @notfilippo any chance we can merge that soon?

Copy link
Contributor

@notfilippo notfilippo left a comment

Choose a reason for hiding this comment

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

lgtm, thanks and sorry for the delay

@notfilippo notfilippo merged commit 2ee7360 into actions-js:master Apr 17, 2024
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.

Is this possible to include git pull --rebase before push?
4 participants