Changeset View
Changeset View
Standalone View
Standalone View
doc/developer-notes.md
Show First 20 Lines • Show All 445 Lines • ▼ Show 20 Lines | |||||
- src/univalue | - src/univalue | ||||
- Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay. | - Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay. | ||||
Git and GitHub tips | Git and GitHub tips | ||||
--------------------- | --------------------- | ||||
- Github is not typically the source of truth for pull requests. See CONTRIBUTING.md for instructions | |||||
on setting up your repo correctly. | |||||
- Similarly, your git remote origin should be set to: `ssh://vcs@reviews.bitcoinabc.org:2221/source/bitcoin-abc.git` | |||||
instead of github.com. See CONTRIBUTING.md for details. | |||||
- For resolving merge/rebase conflicts, it can be useful to enable diff3 style using | - For resolving merge/rebase conflicts, it can be useful to enable diff3 style using | ||||
`git config merge.conflictstyle diff3`. Instead of | `git config merge.conflictstyle diff3`. Instead of | ||||
<<< | <<< | ||||
yours | yours | ||||
=== | === | ||||
theirs | theirs | ||||
>>> | >>> | ||||
Show All 36 Lines |