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

/fast-forward unit test #30

Merged
merged 2 commits into from
Aug 31, 2023

Conversation

nwalfield
Copy link
Contributor

This is a test, this is only a test!

@github-actions
Copy link

Triggered from #30 by @​nwalfield.

Checking if we can fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (1dc25ee).

Target branch (fast-forward-test-014366):

commit 589bed7842068d9d751ad06219ddc42cff5afae4 (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Adding foo

Pull request (fast-forward-test-021563-pr):

commit 1dc25eec78e11a61c1728892c4d2f7e3b6d30d1a (pull_request/fast-forward-test-021563-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:34 2023 +0000

    Adding bar

Can't fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (1dc25ee). fast-forward-test-014366 (589bed7) is not a direct ancestor of fast-forward-test-021563-pr (1dc25ee). Branches appear to have diverged at 61676f3:

fatal: Not a valid object name 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac^
* 1dc25eec78e11a61c1728892c4d2f7e3b6d30d1a Adding bar
| * 589bed7842068d9d751ad06219ddc42cff5afae4 Adding foo
|/  
* 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac Initial commit

commit 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Initial commit

Rebase locally, and then force push to fast-forward-test-021563-pr.

@nwalfield
Copy link
Contributor Author

/fast-forward this...

@github-actions
Copy link

Triggered from #30 (comment) by @​nwalfield.

Trying to fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (1dc25ee).

Target branch (fast-forward-test-014366):

commit 589bed7842068d9d751ad06219ddc42cff5afae4 (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Adding foo

Pull request (fast-forward-test-021563-pr):

commit 1dc25eec78e11a61c1728892c4d2f7e3b6d30d1a (pull_request/fast-forward-test-021563-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:34 2023 +0000

    Adding bar

Can't fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (1dc25ee). fast-forward-test-014366 (589bed7) is not a direct ancestor of fast-forward-test-021563-pr (1dc25ee). Branches appear to have diverged at 61676f3:

fatal: Not a valid object name 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac^
* 1dc25eec78e11a61c1728892c4d2f7e3b6d30d1a Adding bar
| * 589bed7842068d9d751ad06219ddc42cff5afae4 Adding foo
|/  
* 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac Initial commit

commit 61676f3d56774060d0b50d4a2e3ff9c8e84a08ac
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Initial commit

Rebase locally, and then force push to fast-forward-test-021563-pr.

@github-actions
Copy link

Triggered from #30 by @​nwalfield.

Checking if we can fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (4d926c5).

Target branch (fast-forward-test-014366):

commit 589bed7842068d9d751ad06219ddc42cff5afae4 (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Adding foo

Pull request (fast-forward-test-021563-pr):

commit 4d926c5afbd151277d2e1d2fad6c4f3c4d2a88aa (pull_request/fast-forward-test-021563-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:52:11 2023 +0000

    Updating README

It is possible to fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (4d926c5). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward fast-forward-test-014366 to fast-forward-test-021563-pr.

@nwalfield
Copy link
Contributor Author

We should /fast-forward this...

@github-actions
Copy link

Triggered from #30 (comment) by @​nwalfield.

Trying to fast forward fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (4d926c5).

Target branch (fast-forward-test-014366):

commit 589bed7842068d9d751ad06219ddc42cff5afae4 (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:51:33 2023 +0000

    Adding foo

Pull request (fast-forward-test-021563-pr):

commit 4d926c5afbd151277d2e1d2fad6c4f3c4d2a88aa (pull_request/fast-forward-test-021563-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 10:52:11 2023 +0000

    Updating README

Fast forwarding fast-forward-test-014366 (589bed7) to fast-forward-test-021563-pr (4d926c5).

$ git push origin 4d926c5afbd151277d2e1d2fad6c4f3c4d2a88aa:fast-forward-test-014366
To https://github.com/sequoia-pgp/fast-forward-unit-tests.git
   589bed7..4d926c5  4d926c5afbd151277d2e1d2fad6c4f3c4d2a88aa -> fast-forward-test-014366

@github-actions github-actions bot merged commit 4d926c5 into fast-forward-test-014366 Aug 31, 2023
1 check passed
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.

1 participant