On 12 Jul 2015, at 20:32, Kai Großjohann wrote:

On 12 Jul 2015, at 20:30, Kai Großjohann wrote:

On 12 Jul 2015, at 14:51, Benny Kjær Nielsen wrote:

Thanks, I forked it and added the bundle to the default set of bundles (should show up in MailMate within a few hours). I also sent you a pull request with some very minor changes (thinking about it you might not want to change the README file back to the default as I did).

This is highly unfortunate. Of course in the standard version we want to tell folks to check the box in the preferences, but for any forked version I think we should say how to use that forked version. Hm. Other github repos must be having the same issue! There must be a solution for this.

I meant to say that I'm not clear how does git handle these "expected differences"? Suppose Allan creates a new version, then if you pull that version, wouldn't you run into merge conflicts with the README difference?

This had me wondering too. I found the following article which may help:

"What is a pull request?"

http://oss-watch.ac.uk/resources/pullrequest
_______________________________________________
mailmate mailing list
[email protected]
http://lists.freron.com/listinfo/mailmate

Reply via email to