Step 6: Why you do not need to resync your fork with the pharo repo? No you do not need to explicitly resync your fork. Why? Because when you push your commits, you push also the Pharo commits. But let us look at it in details: When you download an image (imagine that this image contains the code of commit3 and that Pharo'repository is at commit5), the repair action will fetch all the commits (up to 5) and put them in your local repository. When you create your bottom branch and later from this one create the branch for your fixes (call it myfix), it means that when you will commit your myfix branch all the commits from myfixes and then 3 down will be pushed back to your fork.
Now if you download the latest image (imagine with commit6 and that the pharo repo is at commit6 - yes this is the latest image!) when you will push your branch (which here point to commit6), automatically all the commits (6 down) will be pushed to your repo. So your fork will be in sync with Pharo's one. > On 15 Sep 2019, at 10:55, ducasse <[email protected]> wrote: > > Hilaire > > > When you download an image (it can come from mars) so the system > does not know, where the sources are, to which commit it should point. > > So this is why you should either clone again or point to the source. > > Once you have downloaded or pointed to your fork (which can be old from a > couple of centuries) > the system should fetch commits from Pharo first to make sure that locally > you have > the same commits than in Pharo. > > Then it should find to which commit your image is from. > For doing that (your image may contain changes that are not committed) > it proposes you several options: > - the first one is to create a branch in your local repository to point > to the current commit of your image > so that you can come back to it (let us call it bottom-xxx). > When you select it, it explains to you the situation and the > consequences. > I will sit with the icebergers and do a pass on the explanation to make > them even more lengthly. > > So at then end of this process you should have your image knowing to which > commit it is from > and you have a branch to point to this place so that you can navigate. > > Now the process to commit is: (from the wiki section I added > https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo > <https://github.com/pharo-project/pharo/wiki/Contribute-a-fix-to-Pharo> > > Create a branch for the issue you want to work on. > Code, then commit, then push to YOUR fork > Issue a PullRequest from your fork to Pharo > Check out your Bottom-xxx branch and you can step 1 > > Is it clearer? > > > BTW I add a section on why we do not need to explictly sync your fork with > the repo on Pharo > > > >> On 15 Sep 2019, at 09:18, Hilaire <[email protected] >> <mailto:[email protected]>> wrote: >> >> Forgot the screenshot about the repair options >> >> -- >> Dr. Geo >> http://drgeo.eu <http://drgeo.eu/> >> >> <WhatNext.png> >
