added 1 commit <ul><li>d539f9ae - Add README.md in vacuum_pump folder</li></ul> [Compare with previous version](/robossembler/arm-tools/vacuum-gripper/-/merge_requests/5/diffs?diff_id=1291324176&start_sha=42fec564acc7a724f09aec961d9b46b54c97edc3)

This pull request has changes conflicting with the target branch.

README.md
src/Vacuum_gripper/Gripper_base.SLDPRT
src/Vacuum_gripper/asm_vacuum_gripper.SLDASM
src/Vacuum_pump/asm_pump.SLDASM
src/Vacuum_pump/pressure_sensor_assy_HX710B.STEP.SLDPRT
src/Vacuum_pump/vacuum pump 2.SLDPRT

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 7-issue:7-issue

git checkout 7-issue

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main

git merge --no-ff 7-issue

git checkout 7-issue

git rebase main

git checkout main

git merge --ff-only 7-issue

git checkout 7-issue

git rebase main

git checkout main

git merge --no-ff 7-issue

git checkout main

git merge --squash 7-issue