[Qgis-community-team] can somebody help me - update my master

[Etienne Trimaille]

Oh ok, it wasn't mention. So dismiss what I said ;-)



Le jeu. 13 févr. 2020 à 18:42, Alexandre Neto <senhor.neto at gmail.com> a
écrit :

> Hi Etienne,
>
> Larissa uses solely github web interface to edit the documentation, that's
> why she needs the master branch on her fork updated regularly.
>
> Alexandre Neto
>
> A quinta, 13/02/2020, 17:35, Etienne Trimaille <
> etienne.trimaille at gmail.com> escreveu:
>
>> Can you explain what do you mean by "my master" ? Do you mean your master
>> branch ON your computer or your master branch ON github (your github
>> repository) ?
>>
>> In the case of your master on github, I usually let it, it's far behind,
>> because usually it's doesn't hurt to have it behind. Nobody use it.
>> For your master branch on your computer, you can do:
>> git checkout master
>> git merge upstream/master (to merge from "upstream")
>>
>> Then, only if you want to update your master on github, you can do
>> git push origin master
>> But I honestly never do this command. And I don't use a PR too.
>>
>>
>> PS : I'm assuming your remote are called upstream and origin, like:
>> etienne at longitude:~/dev/qgis/QGIS-Documentation (master)$ git remote -v
>> origin git at github.com:Gustry/QGIS-Documentation.git (fetch)
>> origin git at github.com:Gustry/QGIS-Documentation.git (push)
>> upstream https://github.com/qgis/QGIS-Documentation.git (fetch)
>> upstream https://github.com/qgis/QGIS-Documentation.git (push)
>>
>> In the Netherlands next month, just ask us ;-)
>>
>> What Alexandre said works too if you want to update your master on github.
>>
>>
>> Le jeu. 13 févr. 2020 à 18:12, Alexandre Neto <senhor.neto at gmail.com> a
>> écrit :
>>
>>> I think you are in the right track.
>>>
>>> 1. Click on Pull Requests
>>> 2. Click new
>>> 3. Click on compare between forks
>>> 4. Use your fork (ljunek\master) as base and QGIS\master as Head
>>> 5. Click create pull request
>>> 6. Give it a name like update master a click create pull request.
>>> 7. With the pull request created, in the bottom, select merge.
>>>
>>> That should be it.
>>>
>>> Alex
>>>
>>>
>>>
>>> A quinta, 13/02/2020, 16:04, Larissa Junek <l.junek at gmx.net> escreveu:
>>>
>>>> Hello folks,
>>>>
>>>> again I'm stuck into gitHub here. I just want to update my master with
>>>> the latest commits. Some weeks ago I made a useless update in the QGIS
>>>> Documentation master to update. Now here, I'm asked to make a pull request
>>>> about stuff the others were contributing.
>>>>
>>>> Can somebody tell me the steps how I can just update my master?
>>>>
>>>> @Alexandre sorry for this mistake, I should know how to update my
>>>> master.
>>>>
>>>> Cheers, Larissa
>>>> _______________________________________________
>>>> Qgis-community-team mailing list for organizing community resources
>>>> such as documentation, translation etc..
>>>> Qgis-community-team at lists.osgeo.org
>>>> https://lists.osgeo.org/mailman/listinfo/qgis-community-team
>>>
>>> _______________________________________________
>>> Qgis-community-team mailing list for organizing community resources such
>>> as documentation, translation etc..
>>> Qgis-community-team at lists.osgeo.org
>>> https://lists.osgeo.org/mailman/listinfo/qgis-community-team
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-community-team/attachments/20200213/d3110e53/attachment-0001.html>