regarding CVS conflicts
Justin wrote:
I made some slight changes to the default_css css file and didn't commit these changes Now, when I update Dada Mail from CVS, it won't update this file This type of issue is bound to happen a lot as we start working on the same files at the same time
As you know, I'm new to this CVS thing myself but Sourceforge's introductory info suggests that during regular use, conflicts are actually rarer than one might first expect, and that, with its robust conflict-resolution tools (like you linked to in your follow-up message) they're usually straightforward to resolve when they do occur [Thanks for that info, btw!]
Still, I knew that the sheer number of structural -- which is to say, more than just line-by-line -- changes I that made to default_css css would seriously muck up a diff with your local repository's version which is why I sent you that personal heads-up (In retrospect, such a major revision was a pretty weird way to inaugurate my CVS work -- glad it didn't spook ya!)
From here forward, I expect the great majority of my commits to be smaller, more easily manageable line-by-line additions, subtractions and tweaks but if I ever do want to attempt a similarly major overhaul of something, I'll be sure to post a quick heads-up to [dadadev] first, so both you & others know it's coming, can advise against it if necessary -- for instance, if you're also in the middle of working on the same file, and don't want something on the CVS that "breaks" your diffs -- and can refresh your local repositories accordingly
Learning, learning
- This mailing list is a public mailing list - anyone may join or leave, at any time.
- This mailing list is a group discussion list (unmoderated)
-
Start a new thread, email: dadadev@dadamailproject.com
This is the developer discussion mailing list for Dada Mail.
If you are just looking for support Dada Mail, consult the message boards at:
https://forum.dadamailproject.com
Documentation for Dada Mail:
Specifically, see the Error FAQ:
https://dadamailproject.com/d/FAQ-errors.pod.html
To post to this list, send a message to:
mailto:dadadev@dadamailproject.com
All subscribers of this list may post to the list itself.
Topics that are welcome:
- Constructive critiques on the program (I like, "x", but, "y" needs some work - here's an idea on how to make this better...)
- Bug/Error reports
- Bug fixes
- Request For Comments on any changes to the program
- Help customizing Dada Mail for your own needs
- Patches
- Language Translations
- Support Documentation/Doc editing, FAQ's, etc.
- Discussion of any changes that you would like to be committed to the next version of Dada Mail -
Dada Mail is on Github:
https://github.com/justingit/dada-mail/
If you would like to fork, branch, send over PRs, open up issues, etc.
Privacy Policy:
This Privacy Policy is for this mailing list, and this mailing list only.
Email addresses collection through this mailing list are used explicitly to work within this email discussion list.
We only collect email addresses through our Closed-Loop Opt-In system.
We don't use your email address for any other purpose.
We won't be sharing your email address with any other entity.
Unsubscription can be done at any time. Please contact us at: justin@dadamailproject.com for any help regarding your subscription, including removal from the mailing list.
All mailing list messages sent from us will include a subscription removal link, which will allow you to remove yourself from this mailing list automatically, and permanently.
All consent to use your email address for any other purpose stated at the time of the mailing list subscription will also be revoked upon mailing list removal.