Closed nyanpasu closed 10 years ago
Note to self: git pull only pulls the branch you are on
thanks linus
merge master -> wip/fileview
@benwaffle But fileview is already up-to-date with master. Did you mean wip/looks-familiar?
... No merge conflicts... What ?
Oh, I thought we were merging into master. Can't you merge manually ?
I'm going to close this because it muddies the waters, thanks for the advice, inuoppai
For @infoburp