search

nix-community / nur-packages-template

A template for NUR repositories: [maintainer=@fgaz]
MIT License
108 stars 104 forks source link

How to merge upstream fixes? #59

Closed YellowOnion closed 1 year ago

YellowOnion commented 2 years ago

I'm no longer getting auto-pull requests from the bot, how can I merge changes that have been recently made?

Mic92 commented 2 years ago 
$ git remote add upstream git@github.com:nix-community/nur-packages-template
$ git fetch upstream
$ git merge upstream

EDIT: Mhm I don't know what auto-pull requests you are talking about? Do you mean the dependabot?

YellowOnion commented 2 years ago

Yeah dependabot, It opened a PR for me once, which was rather nice.

I get:

$ git merge upstream 
merge: upstream - not something we can merge
$ git merge upstream/master
fatal: refusing to merge unrelated histories

Perhaps this is why dependabot isn't working...

Mic92 commented 2 years ago

should not really matter for dependabot if you can merge from the template or not.

Mic92 commented 1 year ago

I think you might have to re-enable dependabot because you use a fork.

YellowOnion commented 1 year ago

Na I used this template, seems to have opened PRs for the last few improvements, perhaps just an intermittent blip.