luzpaz
luzpaz
Experimental snap available of this PR: A build from commit 2032b9f7a7badca4ab4d42932e7cfbe2c69ff0df has been published to channel edge/pr-47 as revision 189. ## Installation instructions ```bash # Note: not all distros require...
@wwmayer please weigh-in when you have a moment. TIA!
Please explicitly add your full [About](https://wiki.freecad.org/About) to bug tickets. thank you!
@WarrenKCash thanks for braving `git`
>git checkout master git fetch upstream git merge upstream/master #
In my experience `git merge` creates a commit. `git rebase` doesn't. So rebase is cleaner on the git history.
Yea, I'll take a look a little later to see what's going on. It looks like you need to `git pull` first. If anyone else has a moment before I...
@paullee0 this is what it's complaining about: 
Now you're ready. 
Better to `git rebase` than `git merge` as it pollutes the git history. Also all commits should have `Sketcher:` pre-pended to their summary