search

root-project / root-docker

Docker recipes for ROOT
30 stars 33 forks source link

Fix pacman call #8

Closed kgizdov closed 4 years ago

kgizdov commented 4 years ago

pacman needs --noconfirm

amadio commented 4 years ago

No merge commits, please. Maybe adding the lines below to your ~/.gitconfig will help:

[pull]
        ff = only
        rebase = merges

This will ensure that a git pull will automatically rebase rather than merge. You may need rebase = preserve if using older versions of git.

kgizdov commented 4 years ago

@amadio could you squash the commits instead?

kgizdov commented 4 years ago

@amadio squashed them for you

amadio commented 4 years ago

I can squash, but then you'll have the same problem next time, as the commit I will add is not a fast forward from what you have, and it also loses your signature. Now I can just merge it as is. Thanks!