search

Dijji / XstReader

Xst Reader is an open source viewer for Microsoft Outlook’s .ost and .pst files, written entirely in C#. To download an executable of the current version, go to the releases tab.
Microsoft Public License
479 stars 70 forks source link

Encrypted/Signed Email changes for Issue #15 #28

Closed just1fi3d closed 3 years ago

just1fi3d commented 3 years ago

see #15

Dijji commented 3 years ago

Congratulations on reaching the finishing line!

But why does the pull request contain 25 commits some of them my own? I was expecting something with just the changes you have made.

Also, the nicest form of pull request is a branch within your fork. That makes it easy for me to pull it into a branch in my own repo, check it out, then merge it into master if all is well.

Dijji commented 3 years ago

Having dug around, I find I can change the target branch for your request. So I am merging it to a branch called SecureMail for full examination

just1fi3d commented 3 years ago

Sorry I didn't get a chance to look at this yesterday. I was afk. This was the first pull request I've done so I'm guessing I somehow included your commits with mine. Thanks for the tip on using a branch will do in the future!

On Sun, Aug 2, 2020, 5:11 AM Dijji notifications@github.com wrote:

Merged #28 https://github.com/Dijji/XstReader/pull/28 into SecureMail.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Dijji/XstReader/pull/28#event-3613291384, or unsubscribe https://github.com/notifications/unsubscribe-auth/AI7ETXGOSARPIVLIRMNI2STR6VJY5ANCNFSM4PRBB7YQ .

Dijji commented 3 years ago

I think what happened is that you made your commit, and then synchronised with the original repository. Because you had made a change, the commits brought over were regarded as new, because they had a different baseline. Then I get a whole raft of them, which are reluctant to apply because how do I know exactly what they will do without carefully examining each one?

Best practice is never to make the changes to master, but always to some branch off master. It is ideal if you synchronise your master with the original before you branch, but that is not necessary. If your master corresponds with any historical state of mine, the pull request will be easy to handle.

At the moment I'm looking at git cherry-pick to see if I can get back to just your change. And afterwards, I get to look in the code!

Dijji commented 3 years ago

Okay, sorted. My repository now has a branch called SecureEmail, with just your changes in. Tomorrow I will look at the code.

just1fi3d commented 3 years ago

Thanks! Sorry for the extra hassle.

On Sun, Aug 2, 2020, 12:38 PM Dijji notifications@github.com wrote:

Okay, sorted. My repository now has a branch called SecureEmail, with just your changes in. Tomorrow I will look at the code.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Dijji/XstReader/pull/28#issuecomment-667715870, or unsubscribe https://github.com/notifications/unsubscribe-auth/AI7ETXFYTVKFBNB3PAN2VYDR6W6D5ANCNFSM4PRBB7YQ .