Skip to content

Fetch From Upstream

space edited this page Jun 2, 2024 · 4 revisions

Fetch and merge from upstream

1) When?

It's a good idea to fetch and merge before you submit your game, and every once in a while.

This is so that you can access new Loungeware features, as well as resolve merge conflicts in advance.

2) Fetch and merge

Command Line

Correct way

git fetch upstream
git merge upstream/main

Lazy way

git pull https://github.com/spacebake/loungeware

Github Desktop

Fetch origin

fetch origin img

Expand branch selector

branch selector img

Choose a branch to merge into main

choose branch button img

Selecct upstream/main

select branch img

Create a merge commit

merge commit img