Phil's edits to paper 2

[drphilmarshall]

Started reading through suggesting re-wordings etc, I'll let you know when I'm done! Feel free to dispute/merge as I go :-) First commit was some abstract re-wordings.

[anupreeta27]

@drphilmarshall please remember that abstract word limit is 250 and it is currently at the limit. So, if you've added words, you'll have to remove another word from somewhere.

[drphilmarshall]

I removed words, it turns out - we're now at 236.

[anupreeta27]

the "space warps" counts as two words because there's a space in between them, in case you have pasted "\sw" in the counter

[anupreeta27]

i managed to merge your version with mine with git :smile:

[drphilmarshall]

:-)

On Sat, May 9, 2015 at 9:52 AM, anupreeta27 notifications@github.com wrote:

i managed to merge your version with mine with git [image: :smile:]

— Reply to this email directly or view it on GitHub https://github.com/drphilmarshall/SpaceWarps/pull/203#issuecomment-100450795 .

[drphilmarshall]

This PR can no longer be merged automatically - I'll git merge from master and resolve the conflicts.

[drphilmarshall]

OK @anupreeta27, I finished going through paper 2. Hope you like the rewording. I see appendix A is still there, fine if you want to keep that text there. Nice job! :-)

[aprajita]

@drphilmarshall how does anu deal with your edits and mine if she hasn't yet merged my edits?

On 9 May 2015, at 23:52, Phil Marshall notifications@github.com wrote:

OK @anupreeta27, I finished going through paper 2. Hope you like the rewording. I see appendix A is still there, fine if you want to keep that text there. Nice job! :-)

— Reply to this email directly or view it on GitHub.

[drphilmarshall]

@anupreeta27, you should:

1) merge automatically whichever PR can be merged, using the web interface 2) check to see if the other one can be merged, and if it can, merge it using the web interface

If conflicts are detected, you'll need to merge on the command line, like this:

git checkout pjm-paper2
git pull origin pjm-paper2
git checkout master
git merge pjm-paper2

Then fix the conflicts using your editor. Search for "<<<" to find the start of each conflict block. The bottom is marked by ">>>". The upper block is what's in the master branch, the bottom block is what sin pjm-paper2 (and it should be labelled that way).

When you've resolved the conflicts and done a git add on the resolved files, you can commit and push back up to the web repo. The other pull request will then update, and tell you whether it can be merged automatically.

It doesn't matter whether you merge Aprajita's changes before or after mine, git merge should sort as much out as it can, and if we have both made edits in the same block of text you will have to figure out how to includ eboth our inputs anyway. Good luck, Anu! Nearly there :-)

On Sun, May 10, 2015 at 12:08 AM, aprajita notifications@github.com wrote:

@drphilmarshall how does anu deal with your edits and mine if she hasn't yet merged my edits?

On 9 May 2015, at 23:52, Phil Marshall notifications@github.com wrote:

OK @anupreeta27, I finished going through paper 2. Hope you like the rewording. I see appendix A is still there, fine if you want to keep that text there. Nice job! :-)

— Reply to this email directly or view it on GitHub.

— Reply to this email directly or view it on GitHub https://github.com/drphilmarshall/SpaceWarps/pull/203#issuecomment-100559312 .

[anupreeta27]

@aprajita i haven't read this entire thread but just to answer your question - see the main branch - i have incorporated your edits (most of them- except for a few which i will do later)...

[aprajita]

ok thanks

On 10 May 2015, at 01:26, anupreeta27 notifications@github.com wrote:

@aprajita i haven't read this entire thread but just to answer your question - see the main branch - i have incorporated your edits (most of them- except for a few which i will do later)...

— Reply to this email directly or view it on GitHub.

[drphilmarshall]

They need to add "citizen science" to their list of keywords - let's leave it in. Thanks for merging! :-)

[anupreeta27]

fine then, will leave it in.