search

PCCMathSAC / apex-mbx

Repository for a conversion of APEX Calculus to MathBook XML
2 stars 10 forks source link

Fixed Merge Conflict #53

Closed CVollet closed 7 years ago

CVollet commented 7 years ago

I also started adding some knowls to 1.4

Alex-Jordan commented 7 years ago

Looks good. Overall, nothing really changes in "analytically", so I think you survived your first merge conflict :)

Alex-Jordan commented 7 years ago

Oops! I meant to approve this when I closed it. Sorry. I noticed in your new PR that I was seeing some of the same things, so it's all good. These changes are in #54.

CVollet commented 7 years ago

OK. I don't know if I know the difference between closing and merging? Closing is basically deleting?

On Wed, Sep 28, 2016 at 6:08 PM, Alex Jordan notifications@github.com wrote:

Oops! I meant to approve this when I closed it. Sorry. I noticed in your new PR that I was seeing some of the same things, so it's all good. These changes are in #54 https://github.com/PCCMathSAC/apex-mbx/pull/54.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/53#issuecomment-250344803, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt66_My7071mmp1VDftXbHyidw5beUks5quw97gaJpZM4KJOid .

Carly Vollet Mathematics Instructor Math Department Co-Chair Math Club Faculty Advisor PCC Cascade, SSB 321 971-722-5564

davidfarmer commented 7 years ago

If you close a pull request, that means you are throwing it away. Merging means that you are accepting those changes into your code.

CVollet commented 7 years ago

I hope I haven't accidentally closed anything!

On Sep 28, 2016 7:36 PM, "davidfarmer" notifications@github.com wrote:

If you close a pull request, that means you are throwing it away. Merging means that you are accepting those changes into your code.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/53#issuecomment-250355821, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt67PqGwO4e7Db_LGIA0FFzJHxOIkpks5quyQrgaJpZM4KJOid .

Alex-Jordan commented 7 years ago

You are "throwing away" the pull request, not the content that went into it. It's no problem if a PR is accidentally closed like I just did. In fact, you can still visit it on GitHub, and just reopen it. However it is a PR from a specific branch on your GitHub repo into a specific branch of the PCCMathSAC repo, and you added a commit to your branch in the meantime after I closed. So I think reopening that PR would be equivalent to the other PR that is open right now.

On Wed, Sep 28, 2016 at 7:57 PM, CVollet notifications@github.com wrote:

I hope I haven't accidentally closed anything!

On Sep 28, 2016 7:36 PM, "davidfarmer" notifications@github.com wrote:

If you close a pull request, that means you are throwing it away. Merging means that you are accepting those changes into your code.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/53#issuecomment-250355821, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt67PqGwO4e7Db_ LGIA0FFzJHxOIkpks5quyQrgaJpZM4KJOid .

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/53#issuecomment-250358467, or mute the thread https://github.com/notifications/unsubscribe-auth/AEg3AE_UUH5PhkdCTm36xx9mI8OOBr-iks5quyk1gaJpZM4KJOid .

Alex Jordan Mathematics Instructor Portland Community College