updating repo forks from project master

[Paul Wratt]

How are you pulling updates from the EmuTOS repo? I will be dropping and re-forking pTOS again tomorrow and the next lot of "issues" will be available as fixes via pull requests.

with the github interface, Merge request and Squashed commits both only add 1 commit, while committing all the changes made to the master. the Rebase option commits everything but then shows that amount of commits ahead AND behind.

How should I update my repo from urs? Should I only work on a new branch and make pull request with changes from there (not updates from master, but the stuff I will fix/add).

Also atm, sometimes I have to boogie a compare to Otto Thorstons repo just so I get the pull request going in the right direction. Doing pull request from a fork is not the same as being part of a project (master) repo.

How can I work this without having to drop the repo and re-fork to keep things clean? (Plus I have to re-clone across a phone every time, not low bandwidth diffs like normal repo updates)

[Keli Hlodversson]

I believe you want to take a look at this page for information on that: https://help.github.com/articles/syncing-a-fork/

…

On Sat, Aug 4, 2018, 14:42 Paul Wratt ***@***.***> wrote: How are you pulling updates from the EmuTOS repo? I will be dropping and re-forking pTOS again tomorrow and the next lot of "issues" will be available as fixes via pull requests. with the github interface, Merge request and Squashed commits both only add 1 commit, while committing all the changes made to the master. the Rebase option commits everything but then shows that amount of commits ahead AND behind. How should I update my repo from urs? Should I only work on a new branch and make pull request with changes from there (not updates from master, but the stuff I will fix/add). Also atm, sometimes I have to boogie a compare to Otto Thorstons repo just so I get the pull request going in the right direction. Doing pull request is not the same as being part of a project repo. How can I work this without having to drop the repo to keep things clean? (I have to reclone across a phone every time, not low bandwidth diffs like normal repo updates) — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#10>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ADT4sWHIGRCENtlPdZQnQlFlk_soCqvQks5uNZbBgaJpZM4Vu-03> .

[Paul Wratt]

thanx for that