Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Contributions

Andreas C. Osowski edited this page Jun 30, 2017 · 4 revisions

Accepting PRs

All commits to the repository must be GPG-signed by one of the contributors. This means that we can't use the GitHub UI to do the merges for us.

Here's a rough outline of how to do a merge, assuming that you're trying to merge #42 and the remote iotaledger points to this repository:

git fetch iotaledger refs/pull/42/head:tmp-merge
git checkout tmp-merge
git rebase --onto master #(with -i if we want to squash)
git checkout master 
git rebase tmp-merge
git push iotaledger master

Note that PRs above 3 commits should be squashed.

Clone this wiki locally