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

Commit work back to GitHub from mybinder.org #5

Open
dhimmel opened this issue Nov 29, 2016 · 0 comments
Open

Commit work back to GitHub from mybinder.org #5

dhimmel opened this issue Nov 29, 2016 · 0 comments

Comments

@dhimmel
Copy link
Owner

dhimmel commented Nov 29, 2016

I used the following workflow (will only work if you're me):

if [ ! -d .git ] ; then
  git init
  git remote add origin https://github.com/dhimmel/biorxiv-licenses.git
  git config --global user.email "[email protected]"
  git config --global user.name "Daniel Himmelstein"
fi

# Add files you want and commit
git add
git commit --message "Your description"
git branch --set-upstream-to=origin/master master

git pull --rebase
# If there's a conflict
git checkout --ours Dockerfile
git checkout --theirs # Files modified by your commits here
# Add files with desired changes
git add 
git rebase --continue

# Push to github (enter username and password when prompted)
git push

Note I don't recommend this -- there are conflicts and it's hard to resolve. Also the binder can be out of date unless you recently rebuilt it.

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

No branches or pull requests

1 participant