[#736] Update Git workflows chapters #158
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AnaCepic
commented
May 2, 2025
|
|
||
| The `staging` branch is reset to `master` after each sprint, or more frequently as we see fit: | ||
| The `staging` branch is reset to the `main` branch after each sprint, or more frequently as we see fit: | ||
|
|
||
| ```bash | ||
| git switch staging | ||
| git reset --hard origin/master | ||
| git push origin staging --force |
There was a problem hiding this comment.
I left master in the bash commands because I think most of our projects still name the default branch master instead of main, so in practice we usually write origin/master rather than origin/main
There was a problem hiding this comment.
Ok, alternatively to the main branch we could also be referencing the default branch (GH docs).
vr4b4c
approved these changes
May 2, 2025
|
|
||
| The `staging` branch is reset to `master` after each sprint, or more frequently as we see fit: | ||
| The `staging` branch is reset to the `main` branch after each sprint, or more frequently as we see fit: | ||
|
|
||
| ```bash | ||
| git switch staging | ||
| git reset --hard origin/master | ||
| git push origin staging --force |
There was a problem hiding this comment.
Ok, alternatively to the main branch we could also be referencing the default branch (GH docs).
cilim
approved these changes
May 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task: #736
Aim
Update Git workflows chapters
Solution
Connected to this PR
Use
main branchinstead ofmasterUse
integrateinstead ofmerge