Closed davidlange6 closed 5 years ago
Hi @davidlange6, is this ready for review? In any case I added a few comments.
hi @eduardo-rodrigues - yes. I didn't plan to do anything more (on this PR)
enjoying the rebases..
@davidlange6 seems you got stucked on the middle... or that the last PR merged conflicted with yours and you need another enjoyment!
hi @jouvin there is no conflict as far as I see.
@graeme-a-stewart, since you have the last PR, which has to be taken on board "together" with this one, do you want to accept the PR when happy? Seems both @jouvin and I are happy; and @davidlange6 too, of course.
@davidlange6 I don't understand, I read:
This branch cannot be rebased due to conflicts Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch.
@davidlange6 please, could you also fix a problem that seems to be there for quite some time of an excess of }
in cwp-main.tex
in ref{data-and-software-preservation}}
? Not sure how it was missed. This seems to be a problem in the common parent of your PR and master as the problem is in master too...
@davidlange6 about the conflicts, I had a look:
cwp.bib
. Basically both the already merged PRs and yours added things at the end of the file and from what I have seen both must be preserved (common ancestor empty). This is easy...cwp-main.tex
also trivial to fix: basically related to the cleanup of repeated references you did. @davidlange6 sorry I missed that the }
issue mentioned in https://github.com/HSF/documents/pull/112#issuecomment-437444798 was fixed by a pending PR that I just merged.
It seems that the conflicts disappeared after merging the pending PR too... So everything fine AFAIC.
Wating for @graeme-a-stewart to approve too before merging.
I have more work to do on the doc. I can fix tomorrow unless someone does it first
Cheers, David
On 9 Nov 2018, at 20:43, Graeme A Stewart notifications@github.com<mailto:notifications@github.com> wrote:
@graeme-a-stewart commented on this pull request.
In CWP/papers/HSF-CWP-2017-01_roadmap/latex/cwp.bibhttps://github.com/HSF/documents/pull/112#discussion_r232371344:
- title = {Unity Ref: Unity 3D Game Development by Example Beginner’s Guide},
- year = {2010},
- publisher = {Packt Publishing} +}
+@incollection{NIPS2014_5423, +title = {Generative Adversarial Nets}, +author = {Goodfellow, Ian and Pouget-Abadie, Jean and Mirza, Mehdi and Xu, Bing and Warde-Farley, David and Ozair, Sherjil and Courville, Aaron and Bengio, Yoshua}, +booktitle = {Advances in Neural Information Processing Systems 27}, +editor = {Z. Ghahramani and M. Welling and C. Cortes and N. D. Lawrence and K. Q. Weinberger}, +pages = {2672--2680}, +year = {2014}, +publisher = {Curran Associates, Inc.}, +url = {http://papers.nips.cc/paper/5423-generative-adversarial-nets.pdf}
Yeah, that still needed to be fixed:
WARN - Entry NIPS2014_5423 does not parse correctly
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/HSF/documents/pull/112#discussion_r232371344, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AEzywxXVQcP3QQZ4CdF5uNJXASlbi9LKks5utdp8gaJpZM4YSaiW.
answering the open issue for non-hep references (actually we had many of them in the bib already...)