Closed wendtke closed 4 years ago
wendtke
commented
4 years ago @SmogDr It looks like most of the merge conflicts are coming from automatic changes to binary files (e.g., re-render png). They would probably be manually resolved by cleaning up and/or deleting the automatically generated images. Instead, I am looking into rebasing as the safer merge option. I've never done it before, so I am reading up on it to make sure I do it right. Fingers crossed.
SmogDr
commented
4 years ago I don’t think you can do any serious damage at this point. Go for it when you feel ready.
-- John Volckens Professor, Mechanical Engineering Colorado State University he, him, his jv.colostate.edu / @Smogdr
From: Kathleen Wendt notifications@github.com Reply-To: SmogDr/edar_coursebook reply@reply.github.com Date: Thursday, July 23, 2020 at 4:02 PM To: SmogDr/edar_coursebook edar_coursebook@noreply.github.com Cc: "Volckens,John" John.Volckens@ColoState.EDU, Mention mention@noreply.github.com Subject: Re: [SmogDr/edar_coursebook] Preliminary Review (#8)
@SmogDrhttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSmogDr&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461348052&sdata=9zEv05YeUX7o1DuuG9LLrbxBsKCZaZsWejPj3sskKdo%3D&reserved=0 It looks like most of the merge conflicts are coming from automatic changes to binary files (e.g., re-render png). They would probably be manually resolved by cleaning up and/or deleting the automatically generated images. Instead, I am looking into rebasinghttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit-scm.com%2Fbook%2Fen%2Fv2%2FGit-Branching-Rebasing&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461358009&sdata=Le3R47iUntWELsoR24hsfYhOo3zwWx6orR18pcl31Y8%3D&reserved=0 as the safer merge option. I've never done it before, so I am reading up on it to make sure I do it right. Fingers crossed.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSmogDr%2Fedar_coursebook%2Fpull%2F8%23issuecomment-663254157&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461358009&sdata=sXwvFoXOWE%2BYgJ8C9qDdGrkSOqPNwkLi2kf%2BPNgkpes%3D&reserved=0, or unsubscribehttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAOKS4TCATUYFICPDHX3ISTTR5CXO7ANCNFSM4OX7FI5A&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461367965&sdata=oS2gXVjJmAWUUlKEO3x0WTLuqbWvrsm8puOiAMHWmaE%3D&reserved=0.
wendtke
commented
4 years ago I resolved the merge conflicts with the binary files manually from master to branch, rebased my branch with your master changes on chapter 8, and then merged successfully. But then I broke the master page build by accident. Fixing that now.
From: SmogDr notifications@github.com Sent: Thursday, July 23, 2020 17:06 To: SmogDr/edar_coursebook edar_coursebook@noreply.github.com Cc: Wendt,Kathleen Kathleen.Wendt@colostate.edu; State change state_change@noreply.github.com Subject: Re: [SmogDr/edar_coursebook] Preliminary Review (#8)
I don’t think you can do any serious damage at this point. Go for it when you feel ready.
-- John Volckens Professor, Mechanical Engineering Colorado State University he, him, his jv.colostate.edu / @Smogdr
From: Kathleen Wendt notifications@github.com Reply-To: SmogDr/edar_coursebook reply@reply.github.com Date: Thursday, July 23, 2020 at 4:02 PM To: SmogDr/edar_coursebook edar_coursebook@noreply.github.com Cc: "Volckens,John" John.Volckens@ColoState.EDU, Mention mention@noreply.github.com Subject: Re: [SmogDr/edar_coursebook] Preliminary Review (#8)
@SmogDrhttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSmogDr&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461348052&sdata=9zEv05YeUX7o1DuuG9LLrbxBsKCZaZsWejPj3sskKdo%3D&reserved=0 It looks like most of the merge conflicts are coming from automatic changes to binary files (e.g., re-render png). They would probably be manually resolved by cleaning up and/or deleting the automatically generated images. Instead, I am looking into rebasinghttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit-scm.com%2Fbook%2Fen%2Fv2%2FGit-Branching-Rebasing&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461358009&sdata=Le3R47iUntWELsoR24hsfYhOo3zwWx6orR18pcl31Y8%3D&reserved=0 as the safer merge option. I've never done it before, so I am reading up on it to make sure I do it right. Fingers crossed.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSmogDr%2Fedar_coursebook%2Fpull%2F8%23issuecomment-663254157&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461358009&sdata=sXwvFoXOWE%2BYgJ8C9qDdGrkSOqPNwkLi2kf%2BPNgkpes%3D&reserved=0, or unsubscribehttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAOKS4TCATUYFICPDHX3ISTTR5CXO7ANCNFSM4OX7FI5A&data=02%7C01%7Cjohn.volckens%40colostate.edu%7C7becd71d666e4ae6e4ad08d82f54151a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311385461367965&sdata=oS2gXVjJmAWUUlKEO3x0WTLuqbWvrsm8puOiAMHWmaE%3D&reserved=0.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSmogDr%2Fedar_coursebook%2Fpull%2F8%23issuecomment-663274221&data=02%7C01%7Ckathleen.wendt%40colostate.edu%7Cf0d572fe009b4785aaf208d82f5d111a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311424049621631&sdata=nBRD6IjBofkuqJwDQUcdq%2F9nBVRbkSsYqJoXh%2FqZNQA%3D&reserved=0, or unsubscribehttps://nam01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAKETYSTJQODTZCSNBEQGXELR5C7AFANCNFSM4OX7FI5A&data=02%7C01%7Ckathleen.wendt%40colostate.edu%7Cf0d572fe009b4785aaf208d82f5d111a%7Cafb58802ff7a4bb1ab21367ff2ecfc8b%7C0%7C0%7C637311424049631624&sdata=9MJoasHivUp2yB1UICFUP0PH7R%2B5JYn%2BNGcEnTT%2BMvc%3D&reserved=0.
Address #2 for Chapters 1-5