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

Change: preferred action for commit integration #4347

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change: preferred action for commit integration #4347

wants to merge 3 commits into from
+33 −21

Conversation

PavelLaptev
Copy link
Contributor

@PavelLaptev PavelLaptev commented Jul 12, 2024 •
edited
Loading

Currently, if there are no integrated remote commits, the preferred action is to Force push, which deletes remote commits. The preferred action in this case should be Integrate upstream.

image

@github-actions github-actions bot added the app label Jul 12, 2024
@PavelLaptev PavelLaptev requested a review from mtsgrd July 12, 2024 21:52
@PavelLaptev PavelLaptev marked this pull request as ready for review July 14, 2024 21:58
@mtsgrd mtsgrd force-pushed the Preferred-action-change-for-commit-integration branch from 672e1fb to 7111b4b Compare July 15, 2024 15:23
@mtsgrd mtsgrd force-pushed the Preferred-action-change-for-commit-integration branch 2 times, most recently from c09ffbf to fc4b41b Compare July 15, 2024 15:56
@mtsgrd
Copy link
Contributor

mtsgrd commented Jul 15, 2024

Sorry for the delay, I'm trying to figure what the appropriate event is for setting that preferred action. I don't think it's reactively to requiresForce, but more something like when it transitions from not having remote commits to having them. Also, this setting seems to be set at a project level, it feels like it would make sense to use branchId in the key instead?

@mtsgrd
Use a better variable name for boolean
cdd2efe 
- integrate -> canIntegrate
@mtsgrd mtsgrd force-pushed the Preferred-action-change-for-commit-integration branch 2 times, most recently from 75807db to cdd2efe Compare July 17, 2024 10:47
@PavelLaptev
Copy link
Contributor Author

@mtsgrd Thank you for helping me. Can I merge it, or do you want to change anything else?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtsgrd mtsgrd Awaiting requested review from mtsgrd

Assignees
No one assigned
Labels
app
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@PavelLaptev @mtsgrd