Re: [topgit] shared topic branch
- From
- Fabien Thomas <thomas.fabien@gmail.com>
- Date
- Jan 27, 2009, 07:23 UTC
- Message-ID
- <111E5FDD-FC51-4DD2-9959-676003CD7A61@gmail.com>
- In-Reply-To
- <20090126120049.GA9676@lapse.rw.madduck.net>
Show 5 quoted lines
>> I'm testing topgit 0.5 in a shared env. (multiple user working on >> same >> patch). > > Sorry for the late reply!
Thanks to reply :)
Show 10 quoted lines
> > >> My problem is that when i want to push my local work i'm doing >> "git push" that will force update the remote branch. The problem >> is that each time master is not up to date i will push my entire >> master or topic branch to the remote. > > I do not understand what you mean. Could yo please try to give us > more detail? git push is intended to push all local changes to the > remote, so I don't understand what your problem is.
I'm new to topgit and to git so maybe there is something i've misunderstood:
on the git side: the + will overwrite all remote location branche named with that pattern ?
on topgit: i'm just doing patches on two computer (home+work) and i'm pushing on a central repo to "backup/share my changes" if i'm not up to date and i start a push with the "+" will overwrite the central repo with my local branch. (overwrite of my central repo master branch and my topics)
to "solve" my problem i've replaced the remote section with this:
[remote "origin"]
url = ssh://git@xxx.com
fetch = refs/heads/*:refs/remotes/origin/*
fetch = refs/top-bases/*:refs/remotes/origin/top-bases/*
push = refs/top-bases/*:refs/top-bases/*
push = refs/heads/topic/*:refs/heads/topic/*is it more clear?