How to fetch upstream updates - jamad/Pixelorama GitHub Wiki

Summary

  • Github Desktop : open cmd
  • cmd : git fetch upstream
  • cmd : git stash --include-untracked
  • cmd : git rebase upstream/master
  • Github Desktop : accepted incoming change to solve conflict , save , continue
  • Github Desktop : wait rebase finish
  • Godot 4.4 : reimported update

In depth

what I did

opened cmd in GithubDesktop

  • image

tried to add the upsteam but it was not necessary

E:\jamad_files\Pixelorama>git remote add upstream https://github.com/Orama-Interactive/Pixelorama.git
error: remote upstream already exists.

E:\jamad_files\Pixelorama>git remote -v
origin  https://github.com/jamad/Pixelorama.git (fetch)
origin  https://github.com/jamad/Pixelorama.git (push)
upstream        https://github.com/Orama-Interactive/Pixelorama.git (fetch)
upstream        https://github.com/Orama-Interactive/Pixelorama.git (push)

fetched upsteam data. No errors

E:\jamad_files\Pixelorama>git fetch upstream

tried to rebase but got some errors

E:\jamad_files\Pixelorama>git rebase upstream/master
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.

so , stashed for the change I wanted to keep

E:\jamad_files\Pixelorama>git stash
Saved working directory and index state WIP on master: afe1ea93 Update README.md

then tried to rebase but got another error

E:\jamad_files\Pixelorama>git rebase upstream/master
error: The following untracked working tree files would be overwritten by checkout:
        addons/SmartSlicer/Classes/RegionUnpacker.gd.uid
        addons/aimg_io/apng_exporter.gd.uid
        addons/aimg_io/apng_import_plugin.gd.uid
        addons/aimg_io/apng_importer.gd.uid
        addons/aimg_io/apng_stream.gd.uid
.... many files

so, I had to use the following command

E:\jamad_files\Pixelorama>git stash --include-untracked
Saved working directory and index state WIP on master: afe1ea93 Update README.md

then rebase command again. I got a error but the message was short

E:\jamad_files\Pixelorama>git rebase upstream/master
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply bd28608a... Update README.md
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply bd28608a... Update README.md

E:\jamad_files\Pixelorama>

Back to Github Desktop, then opened Readme.md in VSCode

accepted incoming change then conflict got solved

Back to Godot4.4, then reimported updated data, then Pixelorama worked fine!

image