search

kliment / Printrun

Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software
GNU General Public License v3.0
2.36k stars 995 forks source link

Update README for Windows #1309

Closed DivingDuck closed 1 year ago

DivingDuck commented 1 year ago

Update for README.md and release_windows.bat.

DivingDuck commented 1 year ago

A GIT noob question: Can you give me a tip how I can compress those differences in my repository w/o loosing my info's?

rockstorm101 commented 1 year ago

Can you give me a tip how I can compress those differences in my repository w/o loosing my info's?

I would say git rebase is your best friend here. I use it all the time on my local copy before submitting PRs here. Caution note, it's a command that rewrites history so it must be used with care and never really on public repositories. This guide I think is quite good: https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

kliment commented 1 year ago

I'll squash them all into one commit here. Now that your repo is up to date with mine, you don't need to keep all those merge commits.

kliment commented 1 year ago

If you just want to get the same state on your side without all the merge commits you can also pull from my repo and force-push to yours.