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

Add rebase for checks #36

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Add rebase for checks #36

merged 1 commit into from
Jun 5, 2024

Conversation

cansavvy
Copy link
Contributor

@cansavvy cansavvy commented Jun 3, 2024 •
edited
Loading

Summary

I think @avahoffman 's Rebase solution is good for the preview branch but for this to be used it needs to be implemented here too.

Carried over from: jhudsl/OTTR_Template#756

git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours

@cansavvy cansavvy requested review from avahoffman and howardbaik June 3, 2024 18:00
This was referenced Jun 3, 2024
Merged
Merged
avahoffman
avahoffman approved these changes Jun 4, 2024
View reviewed changes
Copy link
Contributor

@avahoffman avahoffman left a comment

Choose a reason for hiding this comment

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

Let's do it!

@cansavvy cansavvy merged commit 609a58f into main Jun 5, 2024
4 checks passed
@cansavvy cansavvy deleted the cansavvy-patch-1 branch June 5, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@avahoffman avahoffman avahoffman approved these changes

@howardbaik howardbaik Awaiting requested review from howardbaik

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

Successfully merging this pull request may close these issues.
2 participants
@cansavvy @avahoffman