AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 04:54:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

change rebase into pull (#2669)

Browse Source
This commit is contained in:
shayzluf
2019-05-23 03:23:46 +05:30
committed by terence tsao
parent b040ac909e
commit 5e3931dc44
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTING.md
View File

@@ -88,10 +88,10 @@ You can use the –amend flag to include previous commits that have not yet been
$ git fetch prysm
```
**13. Rebase your branch atop of the latest version of Prysm.**
**13. Pull latest version of Prysm.**
```
$ git rebase prysm/master
$ git pull origin master
```
If there are conflicts between your edits and those made by others since you started work Git will ask you to resolve them. To find out which files have conflicts run ...
@@ -115,10 +115,10 @@ The code from the Prysm repo is inserted between <<< and === while the change yo
**14. Push your changes to your fork of the Prysm repo.**
Rebasing a pull request changes the history on your branch, so Git will reject a normal git push after a rebase. Use a force push to move your changes to your fork of the repo.
Use git push to move your changes to your fork of the repo.
```
$ git push myrepo feature-in-progress-branch -f
$ git push myrepo feature-in-progress-branch
```
**15. Check to be sure your fork of the Prysm repo contains your feature branch with the latest edits.**