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

GH-2011 added warning to use merge commit to merge the branch sync #2060

Merged
merged 1 commit into from
Apr 2, 2020

Conversation

abrokenjester
Copy link
Contributor

@abrokenjester abrokenjester commented Apr 2, 2020

GitHub issue resolved: #2011

Briefly describe the changes proposed in this PR:

Tweaked the github action that creates the master->develop branch sync to output a warning to use merge commit, and made the link to the action script clickable.


PR Author Checklist:

  • my pull request is self-contained
  • I've added tests for the changes I made
  • every commit message starts with the issue number (GH-xxxx) followed by a meaningful description of the change
  • every commit has been signed off

Note: we merge all feature pull requests using squash and merge. See RDF4J git merge strategy for more details.

- also added some markdown to make PR message prettier
@abrokenjester
Copy link
Contributor Author

abrokenjester commented Apr 2, 2020

I'm already annoyed by the checklist :)

Ah well, we'll get used to it.

@abrokenjester abrokenjester merged commit 80ad63a into master Apr 2, 2020
@abrokenjester abrokenjester deleted the GH-2011-github-branch-sync-action branch April 2, 2020 21:20
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.

Consolidate our git branch/merge strategy
2 participants