[Pkg-puppet-devel] Plans for Squeeze?

Stig Sandbeck Mathisen ssm at fnord.no
Mon Oct 4 20:29:05 UTC 2010

Stig Sandbeck Mathisen <ssm at debian.org> writes:

> I guess these differences originate from one of my first merges.  At
> least the string changes looks like something I struggled with during my
> first merge.

While we're on the subject of botched merges....

The merge of 2.6.1 into squeeze-2.6.1 was interrupted by a "git stash",
a cherry pick, a "git stash apply" and a final commit, which caused it
to appear as a normal commit instead of a merge.  I obviously forgot a
"--do-what-I-mean" instead of the default "--do-what-I-type" somewhere.

I'll need to remove it again and re-merge properly.

Stig Sandbeck Mathisen

More information about the Pkg-puppet-devel mailing list