logs archiveBotHelp.net / Freenode / #2f30 / 2015 / July / 24 / 5
biniar
https://www.youtube.com/watch?v=l3NoYyNKSXQ
28:42 into it
or wait, you compile
i forgots
Evil_Bob
ports
biniar
i just read "firefox-esr" lol
Evil_Bob
ah found the issue
gtk+3 depends on libepoxy, but it was moved to xenocara
but i build ports before xenocara, so it didnt have it yet and failed
ill rebuild and install xenocara and retry :)
biniar
Evil_Bob: how did you figure that out so quickly if you don't mind explaining to me :)
commit messages?
cvs log?
Evil_Bob
yeah
and searched for "epoxy"
cvs log | less :)
biniar
I am trying to adapt some of these best practicies myself
spelling errors in there
Evil_Bob
dunno if its a good practise, im new to OpenBSD myself :)
i dont consider myself a linux/unix noob, but i have alot to learn about it
biniar
well i am learning more and more each day i love it
Evil_Bob
yeah same :)
biniar
a lot*
Evil_Bob
i especially like the OpenBSD base system
biniar
next time i format
or get a new hard drive
i will use ports
Evil_Bob
and its getting better each day (doas is a new nice addition)
biniar
in general they just keep it lean and trimmed of unnecessary bullsh*t
Evil_Bob
biniar: i got a SSD this week for my OpenBSD laptop, its much faster
biniar
"why is this here"
"who's side are you on?"
"no way is this going in"
Evil_Bob
biniar: thats what she said
< biniar> "no way is this going in"
stateless: http://git.2f30.org/scripts/tree/upgrade-obsd#n47 should this build xenocara before world? :P
uh nvm
i mistook it for ports :| sorry
biniar
Evil_Bob: lol, nice one
FRIGN: that's what she said
stateless: http://sprunge.us/YdIR
:|
Evil_Bob
Jul 23 12:20:27 puffy dhclient[19463]: send_packet: No buffer space available
u w0t m8
henriqueleng
I also really like OpenBSD, they are doing an amazing work
atmc
every innovation which mattered comes from openbsd
except hammerfs
biniar
which is DragonflyBSD?
Evil_Bob
yeah
henriqueleng
Cool, I did my first $ doas make install
biniar
:)
Evil_Bob
i should probably make an alias to sudo or w/e, not sure :P
atmc
Evil_Bob: if i merge a branch into master the git log doesn't mention 'merge' right?
Evil_Bob
atmc: it depends, you can make it have a separate merge commit or not
i generally prefer not to do that
atmc
i just did
git checkout master
git merge develop
git push
now my master branch has all commits my develop branch has
which is cool
so nothing wrong?
Evil_Bob
yeah thats the point of merging, its good :)
atmc
and when do i need rebase?
if master is way ahead of my branch?
Evil_Bob
when there is a merge conflict or so, or you want to edit the history
atmc
cool
Evil_Bob
atmc: locally you should probably not work on the master branch and have a dev or feature branch for work
atmc
thats what i do
Evil_Bob
so resolving merge conflicts is simpler and easier
regarding rebase, i often use it when i work on a feature or cleanup to merge or rearrange the commits
like: commit 1: fix whitespace
commit 2: fix more whitespace, + style blabla
then do: git rebase -i somecommit
and squash / rearrange them
its kinda ugly i guess, but i use it all the time and works well for my workflow :)
atmc
i just keep all the commits
Evil_Bob
if you want to send patches upstream its sometimes nice to squash some, you dont want to send 10 separate patches for cleanups ;)
atmc
yea sure
Evil_Bob: now that you told me that, i revert the master changes and squash the commits of the develop branch
:(
Evil_Bob
atmc: btw avoid git push -f, it might be tempting sometimes, but its really annoying for someone that pulls your repos :)
atmc
eh
now
git reset --hard $SHA
and how do i push it?
Evil_Bob
lol fu*ker
push -f, but DONT do that
atmc
suggestions?
Evil_Bob
rebase the changes on top of master (probably make a separate branch for this merge) and then just push
you can push to remote master, thats fine
git push remote localmerge:master
atmc
whut
origin/master has the merged commit
now i want to revert origin/master
Evil_Bob
just make a revert commit and push normally
dont reset --hard
atmc
k
but then i have a revert commit
lol
« prev 1 2 3 4 5 6 next »