explorers' club

explorations in dev, science, sci-fi, games, and other fun stuff!

SVN Merge tip

Leave a comment

[note to self]

when naming branches, STOP using the naming convention

YYYYMMDD (label)

it wreaks havoc on the merge process because bash barfs on the parentheses.  Maybe use YYYMMDD label instead?

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s