User login

in progress

To Do software

Have used, still have an account

  • Remember the Milk

Haven't Tried

Procedure for resolving a a left-behind branch that has merge conflicts

DRAFT. Better methods from better minds invited!

Situation: Someone has been working away wonderfully on a git branch on your project. You do some crazy stuff with it over the weekend, and when they, on their continnum branch, go git pull --rebase origin continuum and get conflicts they don't know how to deal with, or when they go git fetch origin and git rebase master and have conflicts.

You want to take this off their hands.

Git rebase workflow and git ahead and behind messages

Update: Just set it up to be automatic.

For all new projects:

git config --global branch.autosetuprebase always

For existing projects:

git config branch.master.rebase true

Courtesy Randy Fay's blog post, "Simpler Rebasing (avoiding unintentional merge commits)"

git pull --rebase
rebasing applies your changes on top of the fetched commits.

Settings for sets of sites: Putting Drush configuration into your project repository

Inherit local-only options with 'parent'

Parent is not working across files. Filed support request:

In an aliases file that lives with your project, so for our SDL project, sdl.aliases.drushrc.php, put in all settings that are true no matter who is using Drush and from where. This is the settings for an externally hosted development collaboration site.

Setting up Mailchimp module version 7.x-2.0

To do anything with the module, you need to connect it to your Mailchimp account. The settings page admin/config/services/mailchimp is where you put your Mailchimp's list API in.

To get this API go to /account/api when logged in to and say add a key. I know this feels weird, as you don't have a key to add, but in fact it will create an API key for you.

Collaboratively writing e-mail (sharing mail drafts)

A test: I gave one GMail account edit access to another GMail account (yes, you can do this) and started editing an e-mail, saved it as draft, and then went to the other account— the draft was there, but not only was there no autorefresh of the other's changes when i edited simultaneously, but it forked and created two drafts of the same e-mail.

Modules in consideration for the SDL project

The Ultimate Project Planning and Management Suite in Drupal

This does not remotely exist yet. Funding a point person to lead the project to make it, and creating or improving all the modules that would make it up, is a job for coordinating community initiatives- itself an initiative that could use support.

Syndicate content