search

u-now / types-x

eXtend ServiceNow development with type definitions
MIT License
1 stars 3 forks source link

Having trouble getting my edits up to my forked repo, before trying to do a pull request #10

Closed emyrold closed 5 years ago

emyrold commented 5 years ago

I'm working on GlideSchedule.d.ts. This is where I'm at.

  1. I created a new branch GlideSchedule.v2
  2. I worked on the remaining methods in the file
  3. I committed
  4. I then pushed and it says everything is up to date on workstation

When I log into GitHub I see my new v2 Branch but when I look at my forked repo the GlideSchedule.d.ts does not have all my edits.

johncaruso commented 5 years ago

Same thing as before. You need to merge the branch back into your local master then push back to your fork.

On Mon, Mar 4, 2019 at 9:34 PM emyrold notifications@github.com wrote:

I'm working on GlideSchedule.d.ts. This is where I'm at.

  1. I created a new branch GlideSchedule.v2
  2. I worked on the remaining methods in the file
  3. I committed
  4. I then pushed and it says everything is up to date on workstation

When I log into GitHub I see my new v2 Branch but when I look at my forked repo the GlideSchedule.d.ts does not have all my edits.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/johncaruso/types-x/issues/10, or mute the thread https://github.com/notifications/unsubscribe-auth/AANsjaD-Xvu7iP9F8UiYsp6pFVrLQcHSks5vTeWmgaJpZM4bdsXy .

emyrold commented 5 years ago

I should have said that I was having a hard time figuring out how to do the merge…. It is only showing me the pull request…

-e

On Mar 4, 2019, at 9:40 PM, johncaruso notifications@github.com wrote:

Same thing as before. You need to merge the branch back into your local master then push back to your fork.

On Mon, Mar 4, 2019 at 9:34 PM emyrold notifications@github.com wrote:

I'm working on GlideSchedule.d.ts. This is where I'm at.

  1. I created a new branch GlideSchedule.v2
  2. I worked on the remaining methods in the file
  3. I committed
  4. I then pushed and it says everything is up to date on workstation

When I log into GitHub I see my new v2 Branch but when I look at my forked repo the GlideSchedule.d.ts does not have all my edits.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/johncaruso/types-x/issues/10, or mute the thread https://github.com/notifications/unsubscribe-auth/AANsjaD-Xvu7iP9F8UiYsp6pFVrLQcHSks5vTeWmgaJpZM4bdsXy .

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/johncaruso/types-x/issues/10#issuecomment-469524513, or mute the thread https://github.com/notifications/unsubscribe-auth/AOQF4e98-K7vGFSLOz48X6VcMdmkDVujks5vTectgaJpZM4bdsXy.

emyrold commented 5 years ago

I figured it out... when we had to do that reverse thing last night the arrows remained pointing to John on the left. I switched it the emyrold/type-x and I was able to finish everything.... after the merge, I then did a pull request to John. After that all finished I deleted my local branches and then pushed those deletes up to my forked repo.... thanks and good night... @johncaruso I'm having a little Koval rye.... :-)

emyrold commented 5 years ago

Thanks!