8 Sep
2011
8 Sep
'11
8:53 p.m.
On Thursday 08 September 2011, Juha Heinanen wrote:
Alex Hermann writes:
I think something like this:
with jh/mtree tracking master (local)
and jh tracking origin/jh/mtree (remote)
eg switch jh/mtree
eg pull --branch master
eg push
eg switch jh
eg pull
You'd first have to pull master in jh/mtree,
push that out to origin,
and then pull that into local jh.
alex,
what would that mean in terms of eg or git commands? in 'jh', i tried 'eg pull --branch
master', but it failed miserably:
$ eg pull --branch master
Automatic merge failed; fix conflicts and then commit
the result.
I think this is doing the right thing, but stumbles upon conflicting changes.
--
Greetings,
Alex Hermann