search

arfc / publications

public repository for the development and distribution of publications
Creative Commons Attribution 4.0 International
2 stars 7 forks source link

European Scenario Paper Revision Requested #30

Closed katyhuff closed 7 years ago

katyhuff commented 7 years ago

I have reviewed the European scenario paper draft and have made scribbles accordingly on this document. europe_nuclear_paper.pdf

This issue can be closed with one or more PRs that address the comments in it.

jbae11 commented 7 years ago

33 is done in response.

katyhuff commented 7 years ago

@jbae11 : Many of the changes I suggested for the longer version of this paper also apply to the ANS summary on the same topic (which maybe only appears in your user space... not the groups... it should get its own repo at this point.).

The deadline for final summaries is September 1. Please make the changes recommended in this issue to the ANS summary as well. https://github.com/jbae11/publications/tree/2017-bae-europe-ans

jbae11 commented 7 years ago

I made the PR (#34) for the ANS summary, but since everything changed (from the original paper files),

it conflicts everywhere. Is there a way to override all conflicts and merge so it looks like my fork?

katyhuff commented 7 years ago

you can "cherry pick" commits. but, I think at this point they've probably diverged enough that it's faster to copy/paste where you need to fix things.

katyhuff commented 7 years ago

wait.. it looks like you tried to merge these branches. why? I can't tell what you did to get where you are...

jbae11 commented 7 years ago

So what I did was I created an ans branch on my fork (jbae/publications) then realized there isnt an ans branch on the arfc/publications. In a desperate attempt I created a new branch called 2017-bae-europe-ans after the 2017-bae-europe..

Does that help? For future references, whatd be a better way to do this?

katyhuff commented 7 years ago

Why desperate?

Instead of doing what you did, you could have directly pushed your jbae11/publications/2017-bae-europe-ans branch to arfc/publication (git push arfc 2017-bae-europe-ans).

At this point, the path moving forward depends on what your local branches look like, which I can't see.

In terms of doing this process better in the future... please just ask if you are getting desperate or confused. Another strategy is that it's safest to do new things in new branches, including merges, so that if it gets messed up, you still have clean copies of the origin state.

On Wed, Aug 30, 2017 at 9:44 PM, Jin Whan Bae notifications@github.com wrote:

So what I did was I created an ans branch on my fork (jbae/publications) then realized there isnt an ans branch on the arfc/publications. In a desperate attempt I created a new branch called 2017-bae-europe-ans after the 2017-bae-europe..

Does that help? For future references, whatd be a better way to do this?

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/arfc/publications/issues/30#issuecomment-326173887, or mute the thread https://github.com/notifications/unsubscribe-auth/AAYCq0DKVIWPpIYoKPmF8JrD1N_7_q3wks5sdh4ngaJpZM4OyDJa .

-- http://katyhuff.github.com

jbae11 commented 7 years ago

Ah, got it. Thanks! A simple git push origin 2017-bae-europe-ans:2017-bae-europe-ans did the job.

jbae11 commented 7 years ago

I think this issue diverted a little bit from its original purpose.. When can it be closed?

katyhuff commented 7 years ago

this can be closed when I have merged #33