(11:14:40 PM) emanuele: mmm...is there any simple way to "share" the branch between the two repos?
(11:16:30 PM) Norv: Add the repos as remotes, and push the branch to both remotes?
(11:16:54 PM) emanuele: but they have different structure
(11:17:06 PM) Norv: what repos are they?
(11:17:14 PM) emanuele: elk and elk.net
(11:17:53 PM) Norv: Ah. The subfolder is the problem
(11:18:26 PM) emanuele: I suppose I just have to keep the history in my repo and push to elk.net just once in a while...
(11:19:06 PM) Norv: Mmm. We have more options... Lets see..we can pick whatever we want for elk.net, so make it easier
(11:19:38 PM) Norv: 1. you can initialize a repo in /elk, with elk remote. And pull from the remote
(11:19:49 PM) Norv: then commit to elk.net
(11:21:31 PM) Norv: 2. /elk can be a submodule (I actually made it first that way) which means 1) is straightforward, it's just the way it works.
(11:23:59 PM) emanuele: ...I just have to re-do everything after Spuds updates... index.css is just one big conflict... lol
(11:25:02 PM) Norv: btw, what do you use for conflicts diff/merge? I just love the combination Cola Git plus Meld
(11:26:01 PM) Norv: it's a breeze, because Cola opens a three-way merge in Meld
(11:26:33 PM) emanuele: mmm...no, that's again one of my commits that it always give me problems during rebase...