Hello Experts,
I am trying to host a git repository in dreamhost, have a pre
installed git version 1.5.4.1 on the server.
I have referred to many sites on which a lot of information given.
http://www.winstonyw.com/2009/08/24/setting-up-a-git-repository-on-dr...
http://wiki.dreamhost.com/Git#Share
On branch combo, I've trying to merge thus:
$ git merge dev/cola_moss
But I get
CONFLICT (content): Merge conflict in site/configs/site.cnfg
I resolve the conflict, but then when I try "git ci" I get
site/configs/site.cnfg: needs merge
site/configs/site.cnfg: unmerged (3282b400086bf54f4357625769d
I wonder if Git could be used to replicate a RoR from 1 main server to
multiple remote server something like server replication to keep
everything sync ?, what about the DB what would be the recommendation
MongoDB or MySQL Replication ?
--
You received this message because you are subscribed to t
Git will only be part of the answer. I would suggest at looking at a tool like
capistrano or chef to handle keeping the deployments in sync. Then you need to
do something else that would keep the databases in sync if you actually want
each of the systems to use the same data.
On Jul 22, 2010, a
On Jul 22, 8:38 pm, Roddie Grant wrote:
> On branch combo, I've trying to merge thus:
> $ git merge dev/cola_moss
>
> But I get
> CONFLICT (content): Merge conflict in site/configs/site.cnfg
>
> I resolve the conflict, but then when I try "git ci" I get
> site/configs/site.cnfg: needs merge
> sit
On 22/7/10 18:50, "Konstantin Khomoutov" wrote:
> On Jul 22, 8:38 pm, Roddie Grant wrote:
>
>> On branch combo, I've trying to merge thus:
>> $ git merge dev/cola_moss
>>
>> But I get
>> CONFLICT (content): Merge conflict in site/configs/site.cnfg
>>
>> I resolve the conflict, but then when I
On 19/7/10 19:24, "Konstantin Khomoutov" wrote:
> On Jul 19, 8:29 pm, Roddie Grant wrote:
>> My recent brush with a forgotten stash has led me to consider again an issue
>> which I've never really got a complete answer to - how much information (if
>> any) about a project should be kept outside
On Jul 19, 2010, at 09:29, Roddie Grant wrote:
> My recent brush with a forgotten stash has led me to consider again an issue
> which I've never really got a complete answer to - how much information (if
> any) about a project should be kept outside Git.
>
> IOW do developers keep a note (on pap
That makes sense, thank you Bray.
Dinooz
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.
