Hi Daniel,
I feel it's a merge issue. Your base tree is probably not updated to the
latest master branch at github.com/LibreCAD/LibreCAD.
Try to merge the latest. since the "printpreview" part should be the same
in the master branch and in my repository, pull request won't be showing it
any more.
My way to do it from scratch (please note I'm using my account as an
example, and my ssh public key is already registered by Account profile)
mkdir -p ~/github
cd ~/github
#clone
git clone
[hidden email]:dxli/LibreCAD.git
cd LibreCAD
#add remote, the official repository
git remote add LibreCAD
https://github.com/LibreCAD/LibreCAD#update the added remote
git fetch --all
#checkout the master branch of the remote to a local branch named "upstream"
git checkout -f -b upstream LibreCAD/master
git checkout master
git merge upstream
git push
now, do some development in my own branch, commit the changes, and keep it
updated:
git checkout upstream
git pull
git checkout master
git merge upstream
git push
here, the upstream branch is from the master branch at LibreCAD/LibreCAD,
and the local master branch is linked to my own repository: dxli/LibreCAD.
also, the remote "LibreCAD" is used read only.
Feel free to ask me any questions you may still have there.
Thanks,
Dongxu
--
Dongxu Li, Ph.D.
www.librecad.org