Re: What time should we stop entering changes to BP document?

Hi Annette


On 01/15/2
015 04:27 PM, Annette Greiner wrote:
> This all makes sense to me except for step 3 where you say “but saving 
> in another folder”. Doesn’t that prevent Git from merging your changes 
> with the previous version?

Yeah, I forgot to tell that you have to put the final version of the 
document that you're working on on the right folder before making the 
commits. Saving in another folder while you are working in it its just a 
way to assure that your repository will be up to date with the 
repository that is at github before you do that - but is not the best 
way to do that.

>
> I think it’s been a good experiment to give Git a try, but I’m having 
> doubts about the value of Git in this context. As a version control 
> system for code, it’s not really built to handle multiple changes in 
> the same line, so we keep having to control who is editing what via 
> emails. Also, there are a significant number of people in the group 
> who are not comfortable using Git. Finally, trying to get a lot of 
> changes in at the same time using  pull requests slows things down and 
> makes more work for editors. Next time around, I would suggest we use 
> only the wiki to handle text changes. Then we can forget about trying 
> to sync two different versioning systems, and we’ll have a tool that 
> was designed for handling editorial workflows.
> -Annette
>

maybe using the wiki can facilitate the work of our WG... question to be 
raised (again)

yaso


> --
> Annette Greiner
> NERSC Data and Analytics Services
> Lawrence Berkeley National Laboratory
> 510-495-2935
>
> On Jan 15, 2015, at 9:35 AM, yaso@nic.br <mailto:yaso@nic.br> wrote:
>
>> Hi Bernadette and Eric!
>>
>> Last week Newton sent us some tips on how to avoid conflic, they are 
>> at github, at readme.
>>
>> Since we all are using the same repository at the same time with 
>> autonomy to authorize the pull, a good practice is to keep an eye at 
>> the updates in the w3c repository. If you notice that the repo was 
>> updated, you have to update your local repo also.
>>
>> There is a bunch of ways of doing this, but, sometimes I use a 
>> "gambiarra [1]":
>>
>> 1. folllow instructions at the front page of dwbp repository to get 
>> your local updated
>> https://github.com/yaso/dwbp/blob/gh-pages/README.md
>>
>> 2. use git pull origin [your local branch] to update your remote fork 
>> (if you have one)
>>
>> 3. edit the document that you want to edit, but saving in another 
>> folder. Before making the push to your remote repo, verify if there 
>> was an update to w3c's repo. If yes, update all your repos. If not, 
>> push your new content and do the pull request.
>>
>> Thats it. If you need any help, call me at gtalk or email, or 
>> something. I'm not a Git specialist but maybe I can help.
>>
>> [1] http://www.urbandictionary.com/define.php?term=Gambiarra
>>
>> yaso
>>
>>
>>
>> On 01/15/2015 11:54 AM, Eric Stephan wrote:
>>> Bernadette,
>>>
>>> I was asking about this over the weekend.  I am not git saavy, and 
>>> I'm just using:
>>>
>>> Before editting
>>>
>>> git pull
>>>
>>> Make changes
>>>
>>> git pull
>>>
>>> git commit -a
>>>
>>> git push origin gh-pages
>>>
>>> Is this incorrect?
>>>
>>>
>>> Eric
>>>
>>>
>>> On Thu, Jan 15, 2015 at 5:24 AM, Bernadette Farias Lóscio 
>>> <bfl@cin.ufpe.br <mailto:bfl@cin.ufpe.br>> wrote:
>>>
>>>     Hi Eric,
>>>
>>>     I'm working on the document now. I'm gonna include some more BP
>>>     and I'm gonna review the document.
>>>
>>>     Feel free to continue your work. We just need to define a
>>>     strategy to avoid merge conflicts :) Any suggestion?
>>>
>>>      We need to have a complete version of the document for our call
>>>     tomorrow.
>>>
>>>     Thanks for your collaboration!
>>>     Bernadette
>>>
>>>
>>>
>>>     2015-01-15 10:07 GMT-03:00 Eric Stephan <ericphb@gmail.com
>>>     <mailto:ericphb@gmail.com>>:
>>>
>>>         Hi,
>>>
>>>         I am working on two sensitive data section best practices
>>>         and need to make a few adjustments on other sections.  How
>>>         much time do we have to complete any work?
>>>
>>>         I am personally hoping for midnight Hawaiian time zone. ;-)
>>>
>>>         Thanks,
>>>
>>>         Eric S
>>>
>>>
>>>
>>>
>>>     -- 
>>>     Bernadette Farias Lóscio
>>>     Centro de Informática
>>>     Universidade Federal de Pernambuco - UFPE, Brazil
>>>     ----------------------------------------------------------------------------
>>>
>>>
>>
>