Here a simple snippet to merge a local branch excluding a file.
This is case “myfile.txt”
git merge --no-ff --no-commit <merge-branch>
git reset HEAD myfile.txt
git checkout -- myfile.txt
git commit -m "merged <merge-branch>"Categories: Bash
Bash
Flameshot
Flameshot is a powerful and simple-to-use screenshot software Here a mini guide to install and setup in ubuntu 24.04 LTS, XDG wayland Install Flameshot on startup go to startup application select flameshot and press edit Read more…
0 Comments