Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 02.equations.md to fix typo #25

Closed
wants to merge 2 commits into from

Conversation

Projects
None yet
3 participants
@slochower
Copy link
Collaborator

commented Jul 16, 2017

Fix typo: delimeters → delimiters

I followed the suggested steps however, it seems both typo commits are in this single PR. Specifically, since I already have a fork I did:

  1. git checkout -b typo
  2. git status to make sure I was up to date.
  3. (Fix the typo)
  4. git add content/02.equations.md
  5. git commit -m "Update 02.equations.md" -m "Fix typo: delimeters → delimiters"
  6. git push mymanubot (Push to my local fork)
  7. (Request the PR)

Is that the correct sequence?

slochower added some commits Jul 16, 2017

Update 02.equations.md
Fix typo: delimeters → delimiters
@dhimmel

This comment has been minimized.

Copy link
Member

commented Jul 16, 2017

Your issue is likely that you ran git checkout -b typo from a branch that had diverged from greenelab:master.

Try:

git fetch upstream
git rebase upstream/master
# If everything worked do
git push --force
@slochower

This comment has been minimized.

Copy link
Collaborator Author

commented Jul 17, 2017

The rebase gets me stuck in some sort of loop that I don't completely understand.

I made some changes then tried to follow the instructions at #6 (comment) followed by git push origin master to push into my fork.

$ git push origin master
Everything up-to-date

But if I check status, I still see

$ git status
rebase in progress; onto 83659ae
You are currently rebasing branch 'master' on '83659ae'.
  (all conflicts fixed: run "git rebase --continue")

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	build/authors.py
	content/authors.tsv

nothing added to commit but untracked files present (use "git add" to track)

If I do a git add . then it tries to add content/authors.tsv back into my fork, instead of removing and replacing it with the metadata.yaml approach.

I don't mean to offload troubleshooting to you, but I think it's still unclear how to work with greenelab/manubot-rootstock as a remote (for me). Are there updated instructions that work for your SciHub manuscript that aren't in #6?

@slochower

This comment has been minimized.

Copy link
Collaborator Author

commented Jul 17, 2017

(I should add that doing git rebase --continue, as suggested, does not solve the problem. It still tries to add a local authors.tsv to my commit.)

@evancofer

This comment has been minimized.

Copy link
Contributor

commented Jul 18, 2017

Not sure if this helps, but I figured I might chime in. I had a similar issue when I tried rebasing my branch. I ended up just merging master into my fork instead, and for reasons largely unknown to me it went more smoothly.

@agitter agitter referenced this pull request Jul 18, 2017

Merged

Update 02.equations.md #30

@dhimmel dhimmel closed this in 9117720 Jul 18, 2017

dhimmel pushed a commit that referenced this pull request Jul 18, 2017

Fix typo in 02.equations.md (#30)
This build is based on
9117720.

This commit was created by the following Travis CI build and job:
https://travis-ci.org/greenelab/manubot-rootstock/builds/254838010
https://travis-ci.org/greenelab/manubot-rootstock/jobs/254838011

[ci skip]

The full commit message that triggered this build is copied below:

Fix typo in 02.equations.md (#30)

Fix typo: delimeters → delimiters

Closes #25

dhimmel pushed a commit that referenced this pull request Jul 18, 2017

Fix typo in 02.equations.md (#30)
This build is based on
9117720.

This commit was created by the following Travis CI build and job:
https://travis-ci.org/greenelab/manubot-rootstock/builds/254838010
https://travis-ci.org/greenelab/manubot-rootstock/jobs/254838011

[ci skip]

The full commit message that triggered this build is copied below:

Fix typo in 02.equations.md (#30)

Fix typo: delimeters → delimiters

Closes #25
@slochower

This comment has been minimized.

Copy link
Collaborator Author

commented Jul 18, 2017

@evancofer Thanks for the input. Do you happen to have the history of the exact commands you used so I can try and see if this works for me?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.