doc: Added instructions in CONTRIBUTE.MD for adding an upstream to forked repo #17152

pull dannmat wants to merge 9 commits into bitcoin:master from dannmat:master changing 1 files +4 −0
  1. dannmat commented at 5:52 PM on October 15, 2019: none

    <!-- *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. -->

    <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. -->

    <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. -->

  2. gui: Added label & tooltip for Verify Message labels b337f58fa0
  3. Moved placeholder code to UI file for verify labels f57dfa20f4
  4. Merge branch 'master' of https://github.com/dannmat/bitcoin dcf708b1e0
  5. Merge pull request #1 from bitcoin/master
    Merge from origin
    d4a475ed7e
  6. Merge remote-tracking branch 'upstream/master' d396ac10eb
  7. Merge branch 'master' of https://github.com/dannmat/bitcoin f5400f45d3
  8. doc: Added instructions for how to add an upsteam to forked repo e1774b34c4
  9. fanquake added the label Docs on Oct 15, 2019
  10. dannmat commented at 6:00 PM on October 15, 2019: none

    I have 7 commits in the pull request, so I feel like I've done something wrong. Can somebody please advise me if this is normal?

  11. MarcoFalke commented at 6:04 PM on October 15, 2019: member

    I think you can get rid of merge commits like so (untested):

    git merge upstream/master
    git reset --soft upstream/master
    git commit -m "the commit message of all commits squashed..."
    
  12. Squashing commits for pull request d4e966fd03
  13. Merge branch 'master' of https://github.com/dannmat/bitcoin fb4328bc89
  14. dannmat commented at 6:35 PM on October 15, 2019: none

    I've added more commits here. I can't seem to get these down. Am I suppose to be rebasing to squash the commits into one?

  15. fanquake commented at 7:30 PM on October 15, 2019: member

    Yes, the only commit that should be here is your change.

  16. dannmat closed this on Oct 15, 2019

  17. DrahtBot locked this on Dec 16, 2021
Labels

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-22 18:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me