-
Notifications
You must be signed in to change notification settings - Fork 57
[Documentation:Developer] Preliminary steps for pushing to a fork #605
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
Conversation
@@ -20,8 +20,14 @@ merging to the main branch. | |||
|
|||
The instructions below are for command line use of git. | |||
|
|||
1. **Before** you begin, confirm that your lcoal main branch of Submitty is |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lcoal -> local
@@ -20,8 +20,14 @@ merging to the main branch. | |||
|
|||
The instructions below are for command line use of git. | |||
|
|||
1. **Before** you begin, confirm that your lcoal main branch of Submitty is | |||
up-to-date. Additionally, if the PR's branch is not up-to-date with Submitty's main, | |||
there will be a button on its Github webpage that you can press to update it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Github webpage -> page on Github (kind of personal preference, but I think it sounds better
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does "button on its page on Github" sound odd?
1. **Before** you begin, confirm that your lcoal main branch of Submitty is | ||
up-to-date. Additionally, if the PR's branch is not up-to-date with Submitty's main, | ||
there will be a button on its Github webpage that you can press to update it. | ||
You may need to resolve some merge conflicts in the process of updating it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove 'some' (also kind of personal preference)
Updates the site as requested to reduce the chances of the commit history issue happening again