iam using Manjaro Linux 20.08. with XFCE Desktop for the Raspberry Pi 4.
Since iam a complete Manjaro Newbie i have an update question.
With this commands i installed amiberry (An Amiga Emulator) succesfully:
git clone https://github.com/midwan/amiberry
make -j2 PLATFORM=pi64
Updates for amiberry appear regularly, which I would like to install.
I wanted to update my existing files with the command “git pull”. But the message appeared that I should do this,
git config pull.rebase false # Merge (default)
git config pull.rebase true # Rebase
git config pull.ff only # only fastforward
or use --rebase, --no-rebase or --ff-only on the command line instead.
If I use “git pull --rebase” this error appears:
error: Pull with rebase not possible: You have changes that are not marked for commit.
error: Please commit the changes or use “stash”.
I have absolutely no idea what to do now. Which “git-pull” command do I have to enter so that the latest files are downloaded from the source https://github.com/midwan/amiberry, so that i can make an executable amiberry file with the command “make -j2 PLATFORM = pi64”?.