urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a comment: branches

master
http://claimid.com/helios 2010-08-15 16:18:35 +00:00 committed by Joey Hess
parent 0a4a7a70ba
commit 09c8683c8e
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/forum/multi_domain_setup_possible__63__/comment_2_75d6581f81b71fb8acbe3561047ea759._comment 100644
View File

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="http://claimid.com/helios"
nickname="helios"
subject="branches"
date="2010-08-15T16:18:35Z"
content="""
So I I just put a blog entry, which is just a file on both branches. Seems I have to learn cherry-picking and merging only some changes.
Still I am duplicating files then and when I edit one file I have to think to also edit the other one or merge the change to it. I thought of a way to tag a blog entry on which site it should appear. And then I just have to edit one file and contents changes on all sites that share it.
But then I possibly can do some master blog / shared content branch, so that shared content is only stored once. Then I need to find a way to automatically replicate the changes there to all sites it belongs too. But how do I store it.
I also thought about just using symlinks for files. Can I have two sites in one repository and symlink shared files stuff around? I know bzr can version control symlinks.
Hmmm, I think I better read more about branching, cherry-picking and merging before I proceed. I used bzr and git, but from the user interface side of things prefer bzr, which should be fast enough for this use case.
"""]]