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 Merge Strategy section to README #1284

Merged
merged 7 commits into from
Sep 6, 2020

Conversation

vorburger
Copy link
Member

@ptuomola @xurror @awasum @avikganguly01 @thesmallstar @percyashu @fynmanoj @vidakovic @conradsp @Grandolf49 how about (something like) this to document the recommended Merge Strategy for this project? Your review feedback, if any, most welcome, of course.

Copy link
Contributor

@awasum awasum left a comment

Choose a reason for hiding this comment

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

LGTM. Just check the typo as the last line: Multiple commits in singl PR make sense in certain cases (e.g. branch backports).

@thesmallstar
Copy link
Member

@vorburger should we not update the github PR template then? which says
image

@vorburger
Copy link
Member Author

LGTM. Just check the typo as the last line: Multiple commits in singl PR make sense in certain cases (e.g. branch backports).

Fixed, using Edit on GitHub UI. Which makes this PR itself now have 2 commits, and I'm too lazy to pull it locally and squash, which makes this an example of a PR that whichever committers merges this should squash... as this documents. 😸

PS: @awasum et al just just use GitHub Suggestions to propose changes directly! (Instead of only "commenting".)

@thesmallstar
Copy link
Member

thesmallstar commented Aug 26, 2020

Fixed, using Edit on GitHub UI. Which makes this PR itself now have 2 commits, and I'm too lazy to pull it locally and squash, which makes this an example of a PR that whichever committers merges this should squash... as this documents. 😸

looks like we are about to have 3 commits as an example now :P

@vorburger
Copy link
Member Author

@vorburger should we not update the github PR template then? which says

great point / feedback, I didn't think of that! Thanks - done now.

looks like we are about to have 3 commits as an example now :P

@thesmallstar yeah, you made me pull it after all (or perhaps I'm too stupid to know how to edit multiple files on GitHub's Web UI).

Copy link
Member

@thesmallstar thesmallstar left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

@Grandolf49 Grandolf49 left a comment

Choose a reason for hiding this comment

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

LGTM

@thesmallstar
Copy link
Member

@vorburger this failed due to connection error (but I think you can merge this anyways)...

Copy link

@xurror xurror left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@percyashu percyashu left a comment

Choose a reason for hiding this comment

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

LGTM

.github/PULL_REQUEST_TEMPLATE.MD Outdated Show resolved Hide resolved
.github/PULL_REQUEST_TEMPLATE.MD Outdated Show resolved Hide resolved
.github/PULL_REQUEST_TEMPLATE.MD Outdated Show resolved Hide resolved
.github/PULL_REQUEST_TEMPLATE.MD Outdated Show resolved Hide resolved
vorburger and others added 4 commits September 6, 2020 19:07
Co-authored-by: Petri Tuomola <ptuomola@users.noreply.github.com>
Co-authored-by: Petri Tuomola <ptuomola@users.noreply.github.com>
Co-authored-by: Petri Tuomola <ptuomola@users.noreply.github.com>
Co-authored-by: Petri Tuomola <ptuomola@users.noreply.github.com>
@vorburger vorburger merged commit 4b435c7 into develop Sep 6, 2020
@brandhuge brandhuge mentioned this pull request Sep 16, 2020
6 tasks
@hmdrzsharifi hmdrzsharifi mentioned this pull request Sep 18, 2020
6 tasks
@brandhuge brandhuge mentioned this pull request Sep 18, 2020
6 tasks
@vorburger vorburger deleted the vorburger-README-merge-strategy branch September 22, 2020 18:03
@fynmanoj fynmanoj mentioned this pull request Sep 23, 2020
6 tasks
@hero78 hero78 mentioned this pull request Aug 19, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants