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

Forcing this back in, need to document a process for incorrect merges #161

Closed
woody-apple opened this issue Mar 31, 2020 · 3 comments
Closed

Forcing this back in, need to document a process for incorrect merges #161

woody-apple opened this issue Mar 31, 2020 · 3 comments
Assignees
@rwalker-apple
Labels
documentation Improvements or additions to documentation
Milestone
May 8, 2020

Comments

@woody-apple
Copy link
Contributor

Forcing this back in, need to make a process for incorrect merges.

Originally posted by @woody-apple in #160 (comment)
@woody-apple woody-apple added the documentation Improvements or additions to documentation label Mar 31, 2020
@woody-apple woody-apple added this to the M4 milestone Mar 31, 2020
@woody-apple woody-apple changed the title Forcing this back in, need to document a process for incorrect merges. Forcing this back in, need to document a process for incorrect merges Mar 31, 2020
@rwalker-apple
Copy link
Contributor

@woody-apple where is the "3 approvers, one from each company" rule documented?

@rwalker-apple
Copy link
Contributor

@woody-apple I think any process for pushing the revert button belongs with the doc for "3 approvers"

@rwalker-apple rwalker-apple modified the milestones: May 1, 2020, May 8, 2020 May 4, 2020
@rwalker-apple
Copy link
Contributor

@woody-apple closing for now unless we have a specific action to be taken in the repository.

cecille added a commit to cecille/connectedhomeip that referenced this issue Jan 11, 2022
@cecille
Fix cluster test project-chip#161
a1ab5d2
andy31415 pushed a commit that referenced this issue Jan 11, 2022
@cecille
Increase test cluster time (#13436)
a0979c9 
* Increase TestCluster timeout

This timeout is the timeout for running the entire test suite.

* Fix cluster test #161
step0035 pushed a commit to hank820/connectedhomeip that referenced this issue Feb 8, 2022
@cecille @step0035
Increase test cluster time (project-chip#13436)
b68ccbf 
* Increase TestCluster timeout

This timeout is the timeout for running the entire test suite.

* Fix cluster test project-chip#161
jmartinez-silabs pushed a commit to SiliconLabs/matter that referenced this issue Oct 13, 2022
@mkardous-silabs @jmartinez-silabs
Pull request project-chip#161: Cherry-Pick Add Github Issue Automatio…
b45c731 
…n to SMG

Merge in WMN_TOOLS/matter from cherry-pick/github_automation to silabs_1.0

Squashed commit of the following:

commit 0a889751c88f167df8eb739fef475ebc18dfd267
Author: Mathieu Kardous <[email protected]>
Date:   Fri Oct 7 14:48:35 2022 +0000

    Pull request project-chip#159: Add Github Issue Automation to SMG

    Merge in WMN_TOOLS/matter from feature/github_automation to silabs

    Squashed commit of the following:

    commit d1a2cd0d0780e925a3451ca437e1224f66a53bf2
    Author: Mathieu Kardous <[email protected]>
    Date:   Thu Oct 6 12:02:16 2022 -0400

        Update smg version field

    commit 4419dbd1181324a0f48df30175c23aff80e75682
    Author: mkardous-silabs <[email protected]>
    Date:   Tue Sep 13 09:48:58 2022 -0400

        Adding Silabs Custom Actions

        Fix issue closer
nipatel-silabs pushed a commit to nipatel-silabs/connectedhomeip that referenced this issue Oct 19, 2022
@mkardous-silabs @jmartinez-silabs
Pull request project-chip#161: Cherry-Pick Add Github Issue Automatio…
da93952 
…n to SMG

Merge in WMN_TOOLS/matter from cherry-pick/github_automation to silabs_1.0

Squashed commit of the following:

commit 0a889751c88f167df8eb739fef475ebc18dfd267
Author: Mathieu Kardous <[email protected]>
Date:   Fri Oct 7 14:48:35 2022 +0000

    Pull request project-chip#159: Add Github Issue Automation to SMG

    Merge in WMN_TOOLS/matter from feature/github_automation to silabs

    Squashed commit of the following:

    commit d1a2cd0d0780e925a3451ca437e1224f66a53bf2
    Author: Mathieu Kardous <[email protected]>
    Date:   Thu Oct 6 12:02:16 2022 -0400

        Update smg version field

    commit 4419dbd1181324a0f48df30175c23aff80e75682
    Author: mkardous-silabs <[email protected]>
    Date:   Tue Sep 13 09:48:58 2022 -0400

        Adding Silabs Custom Actions

        Fix issue closer
mkardous-silabs referenced this issue in mkardous-silabs/connectedhomeip Nov 2, 2022
@mkardous-silabs @jmartinez-silabs
Pull request #161: Cherry-Pick Add Github Issue Automation to SMG
4bd5578 
Merge in WMN_TOOLS/matter from cherry-pick/github_automation to silabs_1.0

Squashed commit of the following:

commit 0a889751c88f167df8eb739fef475ebc18dfd267
Author: Mathieu Kardous <[email protected]>
Date:   Fri Oct 7 14:48:35 2022 +0000

    Pull request #159: Add Github Issue Automation to SMG

    Merge in WMN_TOOLS/matter from feature/github_automation to silabs

    Squashed commit of the following:

    commit d1a2cd0d0780e925a3451ca437e1224f66a53bf2
    Author: Mathieu Kardous <[email protected]>
    Date:   Thu Oct 6 12:02:16 2022 -0400

        Update smg version field

    commit 4419dbd1181324a0f48df30175c23aff80e75682
    Author: mkardous-silabs <[email protected]>
    Date:   Tue Sep 13 09:48:58 2022 -0400

        Adding Silabs Custom Actions

        Fix issue closer
rerasool pushed a commit to SiliconLabs/matter that referenced this issue Nov 2, 2022
@mkardous-silabs @jmartinez-silabs
Pull request project-chip#161: Cherry-Pick Add Github Issue Automatio…
264b607 
…n to SMG

Merge in WMN_TOOLS/matter from cherry-pick/github_automation to silabs_1.0

Squashed commit of the following:

commit 0a889751c88f167df8eb739fef475ebc18dfd267
Author: Mathieu Kardous <[email protected]>
Date:   Fri Oct 7 14:48:35 2022 +0000

    Pull request project-chip#159: Add Github Issue Automation to SMG

    Merge in WMN_TOOLS/matter from feature/github_automation to silabs

    Squashed commit of the following:

    commit d1a2cd0d0780e925a3451ca437e1224f66a53bf2
    Author: Mathieu Kardous <[email protected]>
    Date:   Thu Oct 6 12:02:16 2022 -0400

        Update smg version field

    commit 4419dbd1181324a0f48df30175c23aff80e75682
    Author: mkardous-silabs <[email protected]>
    Date:   Tue Sep 13 09:48:58 2022 -0400

        Adding Silabs Custom Actions

        Fix issue closer
@sharadb-amazon sharadb-amazon mentioned this issue Feb 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@rwalker-apple rwalker-apple

Labels
documentation Improvements or additions to documentation
Projects
None yet
Milestone
May 8, 2020
Development

No branches or pull requests
2 participants
@woody-apple @rwalker-apple