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 workflow direction to include how to push / pull changes #9

Open
pviolette3 opened this issue Aug 29, 2014 · 0 comments
Open
Labels

Comments

@pviolette3
Copy link
Contributor

We need to include instructions on how to push / pull from the repo, for the cases when the shiny "merge branch automatically" button doesn't work (this will be a lot of the time).

One thing that might simplify our source code (but be more complicated for users) is rebase. I found how to rebase a PR which goes over how to pull / push. They squash all of the commits they make into a single commit using rebase. They also never use merge, just rebase their single commit on top of latest master.

@pviolette3 pviolette3 added the bug label Aug 29, 2014
@pviolette3 pviolette3 changed the title Update workflow to include stale branch updates Update workflow direction to include how to update stale branch Aug 29, 2014
@pviolette3 pviolette3 changed the title Update workflow direction to include how to update stale branch Update workflow direction to include how to push / pull changes Aug 29, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant