<div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>Hi Janneke,</div><div><br></div><div>I guess you are talking about <a href="https://github.com/janneke-qgis/QGIS-Documentation/pull/1">https://github.com/janneke-qgis/QGIS-Documentation/pull/1</a> which is unfortunately a pull-request against your own branch and not the upstream one. This is a trap we all fall in at the beginning and mentioned at <a href="https://docs.qgis.org/testing/en/docs/documentation_guidelines/first_contribution.html#share-your-changes-via-pull-request">https://docs.qgis.org/testing/en/docs/documentation_guidelines/first_contribution.html#share-your-changes-via-pull-request</a></div><div><br></div><div>What you have to do is also explained in the page I linked above (if ever not clear, let us know, we'll try to improve it) but in short:</div><div>1. Go to <a href="https://github.com/qgis/QGIS-Documentation/pulls">https://github.com/qgis/QGIS-Documentation/pulls</a></div><div>2. Press "New pull request"</div><div>3. Click "Compare accross forks" and select your repo in the head fork drop down menu and then the your branch (janneke-qgis-patch-1 in this case)</div><div>4. Press "Create pull request"</div><div>5. And you are done!<br></div><div><br></div><div></div><div>H.<br></div></div></div></div></div><br><div class="gmail_quote"><div dir="ltr">Le mer. 9 janv. 2019 à 18:46, Janneke van Dijk <<a href="mailto:janneke.qgis@gmail.com">janneke.qgis@gmail.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div bgcolor="#FFFFFF">
<div class="gmail-m_4941944597617129548moz-cite-prefix">Hi Alexandre and Harrissou (and
others),</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix">I'm trying to feel my way through the
contribution thing and github by starting with some small
remarks/changes I suggested myself. I think I have just made an
edit and created a pull request - it tells me 'This branch has no
conflicts with the base branch'. Not sure how to proceed from
here. Is this enough from my side?</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix">Thanks for some guidance....</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix">Janneke<br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548moz-cite-prefix">On 07/01/2019 23:27, Alexandre Neto
wrote:<br>
</div>
<blockquote type="cite">
<div><br>
</div>
<div>Screenshots shouldn't be a blocker, you can take screenshots
using windows. Then, if we have time, we can replace windows
screenshots later.</div>
<br>
<br>
<div class="gmail_quote">
<div dir="ltr">A seg, 7/01/2019, 18:17, Janneke van Dijk <<a href="mailto:janneke.qgis@gmail.com" target="_blank">janneke.qgis@gmail.com</a>>
escreveu:<br>
</div>
<blockquote class="gmail_quote" id="gmail-m_4941944597617129548gmail_block_quote0">
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375moz-cite-prefix">Yes, I
would be up for learning how to do it. I remember once
upon a time trying to get started and somehow getting
stranded before I got anywhere. Partly because I couldn't
get linux to work on VM on my laptop so I couldn't do the
screen shots.<br>
</div>
</div>
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375moz-cite-prefix">On
07/01/2019 17:39, Alexandre Neto wrote:<br>
</div>
<blockquote type="cite">
<div><br>
</div>
<div>Some of those changes are quite small. Would you be
interested in learning how to fix it yourself? </div>
<br>
<div class="gmail_quote">
<div dir="ltr">A seg, 7/01/2019, 14:37, Alexandre Neto
<<a href="mailto:senhor.neto@gmail.com" target="_blank">senhor.neto@gmail.com</a>>
escreveu:<br>
</div>
<blockquote class="gmail_quote">
<div><br>
</div>
<div><br>
</div>
Actually, someone already did it. Thanks!! <br>
<br>
<div class="gmail_quote">
<div dir="ltr">A seg, 7/01/2019, 14:37, Alexandre
Neto <<a href="mailto:senhor.neto@gmail.com" target="_blank">senhor.neto@gmail.com</a>>
escreveu:<br>
</div>
<blockquote class="gmail_quote">
<div dir="ltr">I can do it.</div>
<span> </span><br>
<div class="gmail_quote">
<div dir="ltr">A seg, 7/01/2019, 13:43, Janneke
van Dijk <<a href="mailto:janneke.qgis@gmail.com" target="_blank">janneke.qgis@gmail.com</a>>
escreveu:<br>
</div>
<blockquote class="gmail_quote">
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202moz-cite-prefix">I've
registered all that I've noticed, I just
didn't manage to tag them with training
manual. Should I do that or is that
someone else who adds the labels?</div>
</div>
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202moz-cite-prefix">Janneke<br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202moz-cite-prefix">On
07/01/2019 00:42, Alexandre Neto wrote:<br>
</div>
<blockquote type="cite">
<div>Better duplicated issues than missing
ones . So please report whatever you
feel that is a bug, or a possible
improvement. That way we won't forget.</div>
<div><br>
</div>
<div>Thanks!</div>
<div><br>
</div>
<div><br>
</div>
<div>
<div class="gmail_quote">
<div dir="ltr">A dom, 6/01/2019,
10:07, Janneke van Dijk <<a href="mailto:janneke.qgis@gmail.com" target="_blank">janneke.qgis@gmail.com</a>>
escreveu:<br>
</div>
<blockquote class="gmail_quote">
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix">Hi
Harrissou,</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix">Getting
ready to at least list my
observations. Do I understand it
correctly that whatever is not
mentioned in [2] is not being
addressed? Quite a few of my
remarks will also related to
updating screenshots, which I
think has also been mentioned as
a general issue somewhere -
should I still list them
separately?</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix">Thanks
for your assistance,</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix">Janneke<br>
</div>
</div>
<div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix"><br>
</div>
<div class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202m_3434176774991171867moz-cite-prefix">On
05/01/2019 13:33, DelazJ wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr">
<div dir="ltr">
<div dir="ltr">
<div dir="ltr">Hi
Janneke,<br>
</div>
<div><br>
</div>
<div>Thanks for your
tests. And indeed the
training manual update
is a work in progress
and maybe could you
publish your remarks
as issue reports in
the doc repository [0]
so that we took them
into consideration as
we go.</div>
<div>You are right about
the missing data,
there was a pull
request [1] to
integrate these data
we forgot to merge.
Done now! Download the
dataset again, please.<br>
</div>
<div>
<div> Note that we are
reviewing initial
lessons and have
some pending updates
for both lessons [2]
and corresponding
data [3]. Tests and
feedbacks are more
than welcome.
Thanks!<br>
</div>
</div>
<div><br>
</div>
<div>[0] <a href="https://github.com/qgis/QGIS-Documentations/issues" target="_blank">https://github.com/qgis/QGIS-Documentations/issues</a></div>
<div>[1] <a href="https://github.com/qgis/QGIS-Training-Data/pull/15" target="_blank">https://github.com/qgis/QGIS-Training-Data/pull/15</a></div>
<div> [2] <a href="https://github.com/qgis/QGIS-Documentation/pulls?q=is%3Apr+is%3Aopen+label%3A%22Training+Manual%22" target="_blank">https://github.com/qgis/QGIS-Documentation/pulls?q=is%3Apr+is%3Aopen+label%3A%22Training+Manual%22</a><br>
</div>
<div>[3] <a href="https://github.com/qgis/QGIS-Training-Data/pull/17" target="_blank">https://github.com/qgis/QGIS-Training-Data/pull/17</a></div>
<div><br>
</div>
<div>Regards,</div>
<div>Harrissou</div>
<div><br>
</div>
<div class="gmail_quote">
<div dir="ltr">Le jeu.
3 janv. 2019
à 13:22, Janneke van
Dijk <<a href="mailto:janneke.qgis@gmail.com" target="_blank">janneke.qgis@gmail.com</a>>
a écrit :<br>
</div>
<blockquote class="gmail_quote">Dear
all,<br>
<br>
I'm currently
going through the
QGIS 3 training
manual <br>
(<a href="https://docs.qgis.org/testing/en/docs/training_manual/" rel="noreferrer" target="_blank">https://docs.qgis.org/testing/en/docs/training_manual/</a>)
using QGIS <br>
3.4.3 and
documenting any
changes that would
still need
attention. I <br>
understand that
it's a work in
progress and
hope/plan to
contribute a <br>
bit in a later
stage. What is
complicating matters
is that the data
that <br>
I downloaded
(QGIS-Training-Data-2.0.zip)
does not contain all
the <br>
layers that are
mentioned (so far
schools,
restaurants,
network_analysis <br>
folder and possibly
some more that I may
have skipped). Is
there a <br>
complete/up-to-date
data set available?
Where can I find it?<br>
<br>
Thanks for any
suggestions,<br>
<br>
Janneke<br>
<br>
_______________________________________________<br>
Qgis-user mailing
list<br>
<a href="mailto:Qgis-user@lists.osgeo.org" target="_blank">Qgis-user@lists.osgeo.org</a><br>
List info: <a href="https://lists.osgeo.org/mailman/listinfo/qgis-user" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-user</a><br>
Unsubscribe: <a href="https://lists.osgeo.org/mailman/listinfo/qgis-user" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-user</a></blockquote>
</div>
</div>
</div>
</div>
</div>
</blockquote>
<p><br>
</p>
</div>
_______________________________________________<br>
Qgis-community-team mailing list for
organizing community resources such
as documentation, translation etc..<br>
<a href="mailto:Qgis-community-team@lists.osgeo.org" target="_blank">Qgis-community-team@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/qgis-community-team" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-community-team</a></blockquote>
</div>
</div>
-- <br>
<div dir="ltr" class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308m_-4576479961595084202gmail_signature">
<div dir="ltr">
<div>Alexandre Neto</div>
<div>---------------------</div>
<div>@AlexNetoGeo</div>
<div><a href="http://sigsemgrilhetas.wordpress.com" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" target="_blank">http://gisunchained.wordpress.com</a><br>
</div>
</div>
</blockquote>
<p><br>
</p>
</div>
</blockquote>
</div>
-- <br>
<div dir="ltr" class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300m_8312361788480057308gmail_signature">
<div dir="ltr">
<div>Alexandre Neto</div>
<div>---------------------</div>
<div>@AlexNetoGeo</div>
<div><a href="http://sigsemgrilhetas.wordpress.com" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" target="_blank">http://gisunchained.wordpress.com</a><br>
</div>
</div>
</blockquote>
</div>
-- <br>
<div dir="ltr" class="gmail-m_4941944597617129548m_5627265551479482375m_-1799957588492171300gmail_signature">
<div dir="ltr">
<div>Alexandre Neto</div>
<div>---------------------</div>
<div>@AlexNetoGeo</div>
<div><a href="http://sigsemgrilhetas.wordpress.com" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" target="_blank">http://gisunchained.wordpress.com</a><br>
</div>
</div>
</blockquote>
</div>
-- <br>
<div dir="ltr" class="gmail-m_4941944597617129548m_5627265551479482375gmail_signature">
<div dir="ltr">
<div>Alexandre Neto</div>
<div>---------------------</div>
<div>@AlexNetoGeo</div>
<div><a href="http://sigsemgrilhetas.wordpress.com" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" target="_blank">http://gisunchained.wordpress.com</a><br>
</div>
</div>
</blockquote>
<p><br>
</p>
</div>
</blockquote>
</div>
-- <br>
<div dir="ltr" class="gmail-m_4941944597617129548gmail_signature">
<div dir="ltr">
<div>Alexandre Neto</div>
<div>---------------------</div>
<div>@AlexNetoGeo</div>
<div><a href="http://sigsemgrilhetas.wordpress.com" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" target="_blank">http://gisunchained.wordpress.com</a><br>
</div>
</div>
</blockquote>
<p><br>
</p>
</div>
</blockquote></div>