Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Create Rule Page #137

Merged
merged 8 commits into from
Apr 22, 2021
Merged

Conversation

thomasgilmore
Copy link
Contributor

@thomasgilmore thomasgilmore commented Apr 21, 2021

Closes #136

Created Rules Page under template

Rules:
Use of - for bullets
Capital letter for TriggerMesh known elements like Bridges, Sources, Targets, use TriggerMesh and not Triggermesh.
Use 1. instead of 1. 2. 3. for lists.

Let me know if there should be any changes.

@antoineco
Copy link
Contributor

@thomasgilmore95 your branch possibility needs to be rebased onto the current master branch.
Let me know if you need my help on that.

Copy link
Contributor

@antoineco antoineco left a comment

Choose a reason for hiding this comment

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

Looks sensible 👍
Only one comment.

Copy link
Contributor

@daceynolan daceynolan left a comment

Choose a reason for hiding this comment

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

So it looks like your rules state to use - and not *, but in the changes made it looks like the bullet lists were all changed to *

Do you mind changing these to -?

@daceynolan
Copy link
Contributor

Also one fun trick of closing the ticket at the same time the PR is closed is by writing

closes with your ticket URL link #136

It will look like closes #136

Then when you merge the PR the ticket is closed. :)

@antoineco
Copy link
Contributor

antoineco commented Apr 21, 2021

@daceynolan the unrelated changes will automatically disappear when the branch gets rebased onto master.

Copy link
Contributor

@antoineco antoineco left a comment

Choose a reason for hiding this comment

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

Not sure what happened but 32 modified files can't be right. Probably a broken rebase.

@thomasgilmore
Copy link
Contributor Author

@antoineco Not really sure what happen with the broken rebase as well. Any tips on fixing it?

@antoineco
Copy link
Contributor

antoineco commented Apr 21, 2021

On the command line that would be:

git fetch origin
git rebase origin/master
git push --force

@thomasgilmore
Copy link
Contributor Author

thomasgilmore commented Apr 21, 2021

Not sure if this fixes things..... let me know??

Just wanted to let you know that I did fork the repo and I'm not sure if that changes things.

my remote -v links are as follows for the project
origin https://github.com/thomasgilmore95/docs.git (fetch)
origin https://github.com/thomasgilmore95/docs.git (push)
upstream https://github.com/triggermesh/docs.git (fetch)
upstream https://github.com/triggermesh/docs.git (push)

@antoineco
Copy link
Contributor

antoineco commented Apr 22, 2021

Ahhh then "origin" should have been "upstream". My bad.

You may still be able to safely reapply the same commands though.

@thomasgilmore
Copy link
Contributor Author

I used upstream now with the same commands.

Copy link
Contributor

@antoineco antoineco left a comment

Choose a reason for hiding this comment

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

Looking better! Thanks

@antoineco antoineco requested a review from daceynolan April 22, 2021 15:29
@antoineco antoineco merged commit c5123ce into triggermesh:master Apr 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create Rules Page
3 participants