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 #31

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 #31 by @​nwalfield.

Checking if we can fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (de5984b).

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

commit a9d36299bbc262ae927ccb0f71f4d1a369f5552a (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Adding foo

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

commit de5984b989712abb7676fa5aa4382eee9dba509c (pull_request/fast-forward-test-01457-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:03:00 2023 +0000

    Adding bar

Can't fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (de5984b). fast-forward-test-014366 (a9d3629) is not a direct ancestor of fast-forward-test-01457-pr (de5984b). Branches appear to have diverged at bc15a73:

fatal: Not a valid object name bc15a73ec229730a08bd1959047ed136da91c142^
* de5984b989712abb7676fa5aa4382eee9dba509c Adding bar
| * a9d36299bbc262ae927ccb0f71f4d1a369f5552a Adding foo
|/  
* bc15a73ec229730a08bd1959047ed136da91c142 Initial commit

commit bc15a73ec229730a08bd1959047ed136da91c142
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Initial commit

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

@nwalfield
Copy link
Contributor Author

/fast-forward this...

@github-actions
Copy link

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

Trying to fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (de5984b).

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

commit a9d36299bbc262ae927ccb0f71f4d1a369f5552a (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Adding foo

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

commit de5984b989712abb7676fa5aa4382eee9dba509c (pull_request/fast-forward-test-01457-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:03:00 2023 +0000

    Adding bar

Can't fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (de5984b). fast-forward-test-014366 (a9d3629) is not a direct ancestor of fast-forward-test-01457-pr (de5984b). Branches appear to have diverged at bc15a73:

fatal: Not a valid object name bc15a73ec229730a08bd1959047ed136da91c142^
* de5984b989712abb7676fa5aa4382eee9dba509c Adding bar
| * a9d36299bbc262ae927ccb0f71f4d1a369f5552a Adding foo
|/  
* bc15a73ec229730a08bd1959047ed136da91c142 Initial commit

commit bc15a73ec229730a08bd1959047ed136da91c142
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Initial commit

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

@github-actions
Copy link

Triggered from #31 by @​nwalfield.

Checking if we can fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (4123a00).

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

commit a9d36299bbc262ae927ccb0f71f4d1a369f5552a (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Adding foo

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

commit 4123a0070c613ea2f33d4b8b838e3812c3e5d433 (pull_request/fast-forward-test-01457-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:03:31 2023 +0000

    Updating README

It is possible to fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (4123a00). 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-01457-pr.

@nwalfield
Copy link
Contributor Author

We should /fast-forward this...

@github-actions
Copy link

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

Trying to fast forward fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (4123a00).

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

commit a9d36299bbc262ae927ccb0f71f4d1a369f5552a (HEAD -> fast-forward-test-014366, origin/fast-forward-test-014366, origin/HEAD)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:02:59 2023 +0000

    Adding foo

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

commit 4123a0070c613ea2f33d4b8b838e3812c3e5d433 (pull_request/fast-forward-test-01457-pr)
Author: Fast Forward Unit Test <[email protected]>
Date:   Thu Aug 31 11:03:31 2023 +0000

    Updating README

Fast forwarding fast-forward-test-014366 (a9d3629) to fast-forward-test-01457-pr (4123a00).

$ git push origin 4123a0070c613ea2f33d4b8b838e3812c3e5d433:fast-forward-test-014366
To https://github.com/sequoia-pgp/fast-forward-unit-tests.git
   a9d3629..4123a00  4123a0070c613ea2f33d4b8b838e3812c3e5d433 -> fast-forward-test-014366

@github-actions github-actions bot merged commit 4123a00 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