Closed AsimHDar closed 4 years ago
Thanks for the start and the google doc, @ElectronicTeaCup! I will push further changes to this branch.
Noting a future todo: I believe there is at least one unpushed tag lying around in @mih fork (resubmission1)
EDIT: FML, resolving the conflict in the webinterface undid my rebase. Will try again ;-) I still haven't mastered the art of rebasing fully. I will leave the current conflicts and hope that they go away if the base branch is changed.
FTR: I have rebased this branch onto the revision_1
branch. revision_1
and preprint
(which this PR was based on before), had identical edits apart from stripping the BRMs formatting. With the rebase, we should have BRMs formatting (required for resubmission).
Once this PR is complete, I suggest merging it into preprint
from the command line and tagging it (resubmission2
) as done with revision_1
. Should the resubmission be accepted, I propose merging this PR into master (not preprint
, as currently specified -- @ElectronicTeaCup this is something you would need to change, it can be done by editing the information right underneath the title of the PR). Doing all of the above should bring master up-to-date with a hopefully accepted manuscript, and preprint up to date with our revisions.
Should the resubmission be accepted, I propose merging this PR into master (not
preprint
, as currently specified -- @ElectronicTeaCup this is something you would need to change, it can be done by editing the information right underneath the title of the PR). Doing all of the above should bring master up-to-date with a hopefully accepted manuscript, and preprint up to date with our revisions.
Got it, the PR is now headed towards merging with master now.
Thanks!
Alrighty, from my side this is ready to go. Here are left-over TODOs:
resubmission
and resubmission2
All the changes from revision_1 and setting off some edits for revision 2.