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

Updated Sources to Template #141

Merged
merged 9 commits into from
Apr 23, 2021

Conversation

thomasgilmore
Copy link
Contributor

@thomasgilmore thomasgilmore commented Apr 23, 2021

Updated sources to follow template

@thomasgilmore thomasgilmore deleted the thomas/sources branch April 23, 2021 01:08
@thomasgilmore thomasgilmore restored the thomas/sources branch April 23, 2021 01:10
@thomasgilmore thomasgilmore reopened this Apr 23, 2021
@antoineco antoineco self-requested a review April 23, 2021 16:52
@antoineco
Copy link
Contributor

antoineco commented Apr 23, 2021

@thomasgilmore95 I'm not sure why the diff shows an identical copy of templates/rules.md, since this file is already on the master branch. Looking at the list of commits, it looks like some commits are old and duplicated, probably due to some merge or rebase.

I this case it doesn't seem to be causing any issue though, so I'm gonna go ahead an merge. I think the way to avoid that is to keep your own master in sync with the upstream repo.

@antoineco antoineco merged commit 390bfeb into triggermesh:master Apr 23, 2021
@thomasgilmore
Copy link
Contributor Author

@antoineco I did see that. However I did not know why it did that.

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.

2 participants