[Learnosm-coord] github LearnOSM

[Blake Girardot]

I am dense as lead sometimes so I have not worked out the way this is 
supposed to work yet.

But :)

The pull request behavior althio describes is how github works with 
other, code based, pull requests I have worked with. If you make a pull 
request and then update anything on the branch the pull request was made 
from, it will automatically update the pull request.

In the programming code world, we avoid that by making more branches off 
the master branch.

Making a new branch is what we call "step 0" of any contribution to a 
github repository.

so for me to fix a bug in the tasking manager, the first thing I do is 
create a branch from my local fork and switch to that branch, make all 
my edits, then pull request. then I forget about that branch until it 
gets merged and then I can delete it.

For the next bug fix, switch to master, make a new branch, do my edits, 
make a pull request.

rinse, repeat.

I don't know if that information helps here at all.

I have to run out, but when I get back I'll go through the process Nick 
outlined and see how it goes for me.

Cheers,
blake








On 12/12/2014 1:57 PM, althio forum wrote:
> Re: fork, commit and pull
>
> OK I understand a bit better what happened...
>
> I was indeed in MY forked repo, not the main so I was obviously able
> to edit without warning.
> But all my successive commits were added to the pull request that I
> created only for the first commit
> https://github.com/hotosm/learnosm/pull/255
> https://github.com/althio/learnosm/commit/6e4d89e511192a6a06763bc95bbc737ee6456b89
>
> The next commits were not intended to be added to the same pull
> request but only as local test for my own sake.
>
> Then Jeff accepted the pull and all went from my repo to the main.
> Pretty clear now at least on my side.
>
> I will have to figure out how to commit and pull exactly what I want.
>
> On 12 December 2014 at 12:41, Nick Allen <nick.allen.54 at gmail.com> wrote:
>> althio,
>>
>> I'm afraid my knowledge on this is very limited. I can comment that every
>> time I do a commit I then get an email warning me
>>
>> 'The page build completed successfully, but returned the following warning:
>> CNAME already taken: learnosm.org For information on troubleshooting Jekyll
>> see:
>> https://help.github.com/articles/using-jekyll-with-pages#troubleshooting If
>> you have any questions please contact us at https://github.com/contact. '
>>
>>
>> I've never looked at the live site to see if my commits are appearing before
>> the pull request is actioned.
>>
>> I'm starting to wonder if we need something in .gitignore, or ?
>>
>> I've blind copied (not sure if he wants his email address known) someone
>> else who has more experience of these things than I do.
>>
>> Header
>> We could do with a multi language header that either we;
>> a/. paste onto the document when we create it, or
>> b/. Is present on all documents but commented out on those that don't use
>> it.
>>
>> Personally I prefer option a/.
>>
>> Regards
>>
>> Nick
>>
>> On 12/12/14 11:17, althio forum wrote:
>>
>> Hi Jeff and Nick
>> Hi all
>>
>> After my first steps on github LearnOSM I have a few questions.
>>
>> First question about strange commits:
>>
>> step 1- At one point I thought I was working on my forked repo... but
>> I was not anymore (blame the user).
>> step 2- For testing purpose and for french translation, I created a
>> file, a directory, moved the file, edited it.
>> [learnosm/_posts/fr/coordination/0500-11-16-remote.md]
>> step 3- My modifications were accepted. As commits if I understand
>> correctly, no pull request. Directly in hotosm/learnosm main branch. i
>> could even see my modifications live on the website at
>> http://learnosm.org/fr/coordination/remote/
>>
>> Is that normal behaviour or a security bug in github or whatever?
>>
>>
>> Second question about header:
>>
>> When editing and translating a page such as
>> learnosm/_posts/en/coordination/0500-11-16-remote.md from english to a
>> new language, it is required from the user to include a header as
>> notice and warning that the translation is in progress.
>>
>> Just by editing the to-be-translated page
>> learnosm/_posts/fr/coordination/0500-11-16-remote.md
>>   ... Is there a
>> way to include something that is really a header and do we just put
>> some text at the top of the main text box?
>>
>> Cheers
>>
>> althio
>>
>> _______________________________________________
>> Learnosm-coord mailing list
>> Learnosm-coord at openstreetmap.org
>> https://lists.openstreetmap.org/listinfo/learnosm-coord
>>
>>
>>
>> --
>>
>> Nick
>>
>> Volunteer 'Tallguy' for
>> https://wiki.openstreetmap.org/wiki/Humanitarian_OSM_Team
>>
>> http://www.openstreetmap.org/user/Tallguy
>>
>> Treasurer, website & Bonus Ball admin for
>> http://www.6thswanleyscouts.org.uk/ (treasurer at 6thswanleyscouts.org.uk)
>>
>>
>> _______________________________________________
>> Learnosm-coord mailing list
>> Learnosm-coord at openstreetmap.org
>> https://lists.openstreetmap.org/listinfo/learnosm-coord
>>
>
> _______________________________________________
> Learnosm-coord mailing list
> Learnosm-coord at openstreetmap.org
> https://lists.openstreetmap.org/listinfo/learnosm-coord
>