RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

CONTRIBUTING.md: Add help for resolving a pull request

Browse Source
This commit is contained in:
Martine S. Lenders 2019-11-22 17:44:05 +01:00
parent 81dbab193e
commit 7aae27de03
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CONTRIBUTING.md
View File

@ -354,6 +354,20 @@ makes it difficult for the reviewer to follow them. It might also happen that
you introduce regression and won't be able to recover them from previous you introduce regression and won't be able to recover them from previous
commits. commits.
If you encounter a merge conflict you could either resolve it by hand with an
editor and use
$ git add -p
To add your changes or use a merge tool like [meld](https://meldmerge.org/) to
resolve your merge conflict.
$ git mergetool
After the merge conflict is resolved you can continue to rebase by using
$ git rebase --continue
Once squashing is done, you will have to force push your branch to update the Once squashing is done, you will have to force push your branch to update the
PR: PR: