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

Reorder history to be after the break #69

Merged
merged 1 commit into from
Feb 26, 2025

Conversation

astroDimitrios
Copy link
Member

Fixes #68

@astroDimitrios astroDimitrios self-assigned this Feb 25, 2025
three options for merging your feature
branch into `main`.
We will now explore how each merging method
affects the history of your repository.
In all the examples below we start with the same git history.

### Merge
## Merge
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't these be subheadings under the ## Merge Options section?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can change them back at some point perhaps but I thought it might be useful if they appeared in the sidenav bar which they won't unless they are ##

@astroDimitrios astroDimitrios merged commit 7d4ed94 into MetOffice:main Feb 26, 2025
1 check passed
@astroDimitrios astroDimitrios deleted the 61_afternoon_order branch February 26, 2025 09:07
github-actions bot pushed a commit to astroDimitrios/git-working-practices that referenced this pull request Feb 26, 2025
Auto-generated via `{sandpaper}`
Source  : 7d4ed94
Branch  : main
Author  : Dimitrios Theodorakis <[email protected]>
Time    : 2025-02-26 09:06:59 +0000
Message : MetOffice#69 Reorder history to be after the break
github-actions bot pushed a commit to astroDimitrios/git-working-practices that referenced this pull request Feb 26, 2025
Auto-generated via `{sandpaper}`
Source  : 17bcf01
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2025-02-26 09:11:45 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : 7d4ed94
Branch  : main
Author  : Dimitrios Theodorakis <[email protected]>
Time    : 2025-02-26 09:06:59 +0000
Message : MetOffice#69 Reorder history to be after the break
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.

Move merge strategies before forks straight after the lunch break
2 participants