Git Workflow

Basic commands

git fetch

git pull

git add .

git commit -m "Commit message"

git push

git status

Branching and Merging

https://git-scm.com/book/en/v2

Use GitHubflow branching strategy. 1 main branch and many small, frequent feature branches.

https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy

git branch branch-name

git checkout branch-name

...

git push -u origin branch-name

git checkout main

git merge branch-name

git branch -d branch-name deletes branch

Merge Conflicts:

https://stackoverflow.com/questions/161813/how-do-i-resolve-merge-conflicts-in-a-git-repository

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

After resolving merge conflicts run the game and look at the code, to see if all ok.