Update from upstream

Merge upstream preferring your files

This is a merge, not a rebase.

Step-by-step (recommended)

1️⃣ Make a safety backup

git checkout start_menu
git branch backup-before-ours-merge

2️⃣ Fetch upstream

git fetch upstream

3️⃣ Merge, preferring YOUR files

git merge -X ours upstream/master

What this does:

• merges upstream history

• for conflicts → keeps your file

• no rebase, no history rewrite

4️⃣ If Git still reports conflicts (rare)

Some conflicts are not auto-resolvable.

Resolve by choosing your file:

git checkout --ours <file>
git add <file>
git commit

5️⃣ Push normally

git push origin start_menu