search

bagder / http3-explained

A document describing the HTTP/3 and QUIC protocols
https://http3-explained.haxx.se/
Creative Commons Attribution 4.0 International
2.14k stars 194 forks source link

Add five more files and a missing space #129

Closed kfv closed 4 years ago

bagder commented 4 years ago

"This branch cannot be rebased due to conflicts" seems odd...

kfv commented 4 years ago

Yeah it seems odd, I guess GitHub expected me to delete the fork and re-fork it for further contribution :-/

bagder commented 4 years ago

No, I don't think so. Most users keep using the same fork for extended periods of time. But I don't know how this happened anyway.

kfv commented 4 years ago

Hm ... weird. What do you recommend? :-/

bagder commented 4 years ago

First, it appears as if you did this pull request from your master branch. I would strongly discourage that. Work on things in branches instead, never in master.

Then, make sure your master branch is in sync with upstream every once in a while. As you work alone in your own branch, you can then easily rebase that branch onto master (if it lives for a while and master keeps developing). If you rebase a branch that you've already pushed, you need to force-push it next.

quantumsheep commented 4 years ago

Seems fixed

kfv commented 4 years ago

@bagder Oh thanks for your notes, alright, I'll work on things in another branch of my fork.

@quantumsheep Thanks for your help.