sharedworkflow.md

Shared Workflow

Initial Setup

(Assumes that you use Ubuntu)

1. Install git with sudo apt updateand sudo apt install git
2. Download Visual Studio Code with sudo snap install --classic code
3. Add the GitHub Pull Requests and Issues-Extension
4. In VS Code, in the extension, sign in using your GitHub account
5. Click on "Clone Repository" and paste the following link: https://github.com/DTenore/CD_HS21_Shared.git
6. Choose local folder where you want to have your local copy

How to use your own branch

1. Update local repo with git pull origin main
2. Create a working branch with git checkout -b MyNewBranch
3. Make changes on branch and stage & commit them in the Source Control
4. Upload changes with git push origin MyNewBranch

How to merge a branch into main

1. After you commited locally, in the GitHub Pull Requests and Issues-Extension click on the Create Pull Request Icon

2. Check that the local branch and repository you're merging from, and the remote branch and repository you're merging into, are correct. Then give the pull request a title and a description and click **Create**.

Unable to resolve reference

1. rm .git/<unresolved reference>
2. git fetch
3. git pull origin <Branch>