Conceptual branching bug?

I'm new to subversion so hopefully there is a good workaround to this
conceptual problem...

Say a project has only two files (to keep things simple):
1. code.c
2. design.pdf

Project lifestyle:
1. Make a new base repository
2. Users checkout, modify, merge, commit
3. More users checkout, modify, merge, commit
4. One branch is made (aka Alpha), another branch his made (aka Bravo)
5. Users under the Alpha configuration need the code and design to look a
specific way. Users checkout, modify, merge, commit under their branch.
6. Users under the Bravo configuration need the code and design to look a
specific way. Users checkout, modify, merge, commit under their branch.

Problem...
7. Users under Alpha or Bravo find some bugs in the base code and/or design,
but Alpha and Bravo can't exactly merge because their specific
configurations will always be different.

How does Subversion handle this problem? Because the Alpha and Bravo guys
have different configurations, they can merge code, but constantly have to
ignore certain changes. Furthermore, they can't really merge the design
since the design is in PDF format.

How should I handle this scenario?

-- 
View this message in context: http://www.nabble.com/Conceptual-branching-bug--tp19994719p19994719.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org