-
br-m<waozi:matrix.org> linking to dbus from ubuntu packages gives the systemd error/ requirement.
-
br-m<waozi:matrix.org> therefore i have used the same pattern as for other dependencies in the dockerfile to git clone the source and build it statically without the systemd requirement.
-
br-m<waozi:matrix.org> the pr is ready for review
-
selstawaozi: please squash and also undo unrelated newline changes
-
selsta.merge+ 4618
-
xmr-prAdded
-
br-m<waozi:matrix.org> selsta: done
-
br-m<waozi:matrix.org> nvm i don't know how to squash i'll just d o a fresh pr again
-
selstagit rebase --interactive master
-
selstaand then set them to s
-
selstaapart from the main commut
-
selstacommit
-
br-m<waozi:matrix.org> i tried that, it showed all the commits from the last time i had as well, tried to delete them since i got a comlpained about that last time and now everything is gone so i mut have made a mistake along the way trying to squash it.
-
br-m<waozi:matrix.org> have to start from zero
-
br-m<waozi:matrix.org> i'll delete my fork and start from scratch so there are no extra artifacts or unwanted commits
-
br-m<waozi:matrix.org> here third attempt at not having extra commits so it can be reviewed
-
br-m<waozi:matrix.org> monero-project/monero-gui #4622
-
tobtoht.merges
-
xmr-pr4618
-
br-m<jpk68:matrix.org> @waozi:matrix.org What I just do is this: say you have 3 commits you want to squash into one. Do git rebase -i HEAD~3 and then change all commit lines from 'pick' to 'squash' except the first one
-
br-m<jpk68:matrix.org> And then also remove the commit messages in the next screen, aside from the one you want to keep
-
br-m<jpk68:matrix.org> youtube.com/watch?v=IlFK3JGCDqU
-
br-m<waozi:matrix.org> thanks, my mistake was rebasing with master, since my master branch had the old commits we already avoided in the second pr, and by rebasing with that it became a mess
-
br-m<waozi:matrix.org> moving forward we now have a pr that has no further commits, just 1 commit
-
br-m<waozi:matrix.org> is this the default practice if i have to do any change to the pr is to always squash into 1 commit? just so i know for next time
-
br-m<jpk68:matrix.org> @waozi:matrix.org: Yes
-
br-m<jpk68:matrix.org> You should also probably checkout a new branch from master for each PR, so that all your commits don't get tangled together
-
br-m<ofrnxmr:xmr.mx> s/probably/definitely
-
br-m<waozi:matrix.org> okay thanks