[bt-devel] working with Git / SVN

[Olaf Radicke]

Am Freitag, den 23.07.2010, 19:31 +0300 schrieb Jaak Ristioja:
> On 23.07.2010 18:24, Olaf Radicke wrote:
> > I am to work with 'pull' or better with 'rebase'?
> 
> I'm not a very experienced git user, but I think 'rebase' will be
> better.
> 
> http://gitorious.org/bibletime/svn-trunk is just a mirror of the real
> SVN repository and
> it is updated using git-svn. Therefore we can't merge any of your
> changes to the real SVN
> repository like one would do with git.

If you pull from my git-repos in to
http://gitorious.org/bibletime/svn-trunk and then commit from
gitorious.org to sf.net i think, it's better i pull.

olaf <-- pull -- gitorious.org <-- 'svn rebase' -- sf.net
olaf -- pull --> gitorious.org -- 'svn dcommit' --> sf.net
olaf <-- pull -- gitorious.org <-- 'svn rebase' -- sf.net

If i commit directly to sf.net, then it's better i make 'rebase'.

olaf <-- rebase -- gitorious.org <-- 'svn rebase' -- sf.net
olaf -- 'svn dcommit' --> sf.net
olaf <-- rebase -- gitorious.org <-- 'svn rebase' -- sf.net

In first way, you have the conflicts. In second way - i have the
conflicts...

CU
Olaf