Skip to content

Merge in Samarjeet's updated figure and code#97

Merged
davidlmobley merged 8 commits intomasterfrom
post_edits
Nov 7, 2018
Merged

Merge in Samarjeet's updated figure and code#97
davidlmobley merged 8 commits intomasterfrom
post_edits

Conversation

@davidlmobley
Copy link
Copy Markdown
Member

No description provided.

@davidlmobley
Copy link
Copy Markdown
Member Author

Grr, has conflicts because Samarjeet didn't update his TeX first. Off to meetings. @JIMonroe or @justinGilmer do you have a minute to sort it out?

@JIMonroe
Copy link
Copy Markdown
Collaborator

JIMonroe commented Nov 6, 2018

I can work on this.

@JIMonroe
Copy link
Copy Markdown
Collaborator

JIMonroe commented Nov 6, 2018

@samarjeet I just went with the most up to date tex version from master, which means you may have lost edits to the text that you made.

Could you check this and make changes if you want to?

Before you make changes, though, please run

git checkout post_edits
git pull post_edits

When you're done, commit and run git push origin post_edits to add you're commits here.

@JIMonroe
Copy link
Copy Markdown
Collaborator

JIMonroe commented Nov 6, 2018

That is to say, the figure is updated, but the text, including the caption, etc., may not have the edits you want.

@davidlmobley
Copy link
Copy Markdown
Member Author

Alternatively you can bring in edits to the caption in a separate PR from a separate branch, which is the approach I proposed in the toher thread, @samarjeet . (In which case we should merge this one first.)

@davidlmobley
Copy link
Copy Markdown
Member Author

@samarjeet were you going to edit the caption, etc.? I want to get this merged and resubmitted.

@samarjeet
Copy link
Copy Markdown
Collaborator

@davidlmobley Edited. Can you please review and merge ?

Comment thread paper/basic_training.tex Outdated
@davidlmobley
Copy link
Copy Markdown
Member Author

Thanks!

@davidlmobley davidlmobley merged commit d2f851c into master Nov 7, 2018
@davidlmobley davidlmobley deleted the post_edits branch November 7, 2018 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants