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

Formatting and minor suggestions #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Formatting and minor suggestions #39

wants to merge 1 commit into from

Conversation

enormandeau
Copy link

Mostly adding back ticks (`) around program names, some commas and minor clarifications.

Mostly adding `back ticks` (\`) around program names, some commas and minor clarifications.
Copy link
Collaborator

@gmarcais gmarcais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Can you rebase those changes on top of the develop branch and resubmit a pull request?

@enormandeau
Copy link
Author

I'd love to learn how to rebase like you suggest but this is something I have never done. I'm worried I will mess the history. I read through https://git-scm.com/book/en/v2/Git-Branching-Rebasing but I'm not 100% sure how to do it. Should I go

git checkout develop
git rebase master
# potentially followed by
git checkout master
git merge develop

or

git rebase develop
# potentially followed by
git checkout develop
git merge master

I've tried both locally but really I'm not sure what is the proper way.

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

Successfully merging this pull request may close these issues.

2 participants