| Table of Contents |
|---|
Key Points
...
Key Concepts
Different Branching Strategies
https://www.flagship.io/git-branching-strategies/
git-branching-strategies-flagship.io-GitFlow Github Flow Trunk Based.pdf file
the Git branching model is lightweight compared to other version control systems; this is why it’s so easy and cheap to create branches in Git, as the whole code doesn’t need to be copied to the branch creating a large amount of duplicate files, as opposed to other VCS tools.
Client options to connect to Github
...
When you set up SSH, you will need to generate a new SSH key and add it to the ssh-agent. You must add the SSH key to your account on GitHub before you use the key to authenticate. For more information, see "Generating a new SSH key and adding it to the ssh-agent" and "Adding a new SSH key to your GitHub account."
To use your SSH key with a repository owned by an organization that uses SAML single sign-on, you must authorize the key. For more information, see "Authorizing an SSH key for use with SAML single sign-on" in the GitHub Enterprise Cloud documentation.
See
m Linux Remote Access Tools#KeyGenerationforaccesstoremoteservices(Githubetc)
...
Warning! Please do not depend on using Git directly or GET /repos/:owner/:repo/git/refs/:ref for updates to merge Git refs, because this content becomes outdated without warning.
...
One Process to Rebase repos after a repo rename
Here is the process that I will be following for each repository:
- Use the new Github feature to rename default branch. This automatically re-targets PRs to "main" and updates branch protections rules.
- PR to update master references in CI pipelines, docs, etc
- Update default branch in Azure Pipelines
Once it is done for a repository, each developer that has a local fork will need to perform the following steps to update their local environment, push the main branch to their fork and associate with local main branch, and ensure local main is rebased on the upstream main branch:
git checkout master
git branch -m master main
git fetch origin
git push origin main
git branch -u origin/main main
git fetch upstream
git rebase upstream/main
The steps assume you are following the Github fork and upstream remote instructions here:
https://hyperledger-fabric.readthedocs.io/en/latest/github/github.html
Please let us know if you have any other suggestions or comments.
Bitbucket
Bitbucket intro
https://www.geeksforgeeks.org/introduction-to-bitbucket/?ref=rp
...