[Qt-jambi-interest] Should I merge the build branch into the master branch?

[Francis Galiegue]

On Sat, Dec 12, 2009 at 10:13 PM, Helge Fredriksen <hf at poseidon.no> wrote:
> Fracis,
>
> I'm quite a newbie to git, could you give me some hints
> on how to pull your changes from the build branch?
>
> I did a
>
> git checkout --track -b build and a
> git-pull
>
> on the default clone on the community-port-to-4_6 repo,
> but there were some complaints from git about some
> missing merge branch. Please advise.
>
>
> Regards,
> Helge Fredriksen
>
> I honestly wasn't aware that these were not in the master
> branch....
>

[
Zeroeth: do

git config --global color.ui auto

This will make outputs nicer
]

First:

git remote show

This will show all remote repositories defined. The first one is
always named origin and will be the default remote reference used for
git fetch/push/pull operations.

Then:

git fetch

This will fetch all changes from the origin remote. If you want to
fetch from other remotes, use git fetch <remotename>.

Then do a:

git remote show -n $(git remote show)

This will show the local branches and which remote branch they track.
For instance, I have:

----
* remote 4.6-port
[...]
  Remote branches: (status not queried)
    build
    master
  Local branches configured for 'git pull':
    build  merges with remote build
    master merges with remote master
----

Which means that my local "build" branch tracks (and pushes to)
"4.6-port/build".

If you want to add a tracking branch, do "git branch -t <branchname>
<remotebranchname>". For instance:

git branch -t build origin/build

Then:

git checkout build

will checkout that branch.

-- 
Francis Galiegue, fgaliegue at gmail.com
"It seems obvious [...] that at least some 'business intelligence'
tools invest so much intelligence on the business side that they have
nothing left for generating SQL queries" (Stéphane Faroult, in "The
Art of SQL", ISBN 0-596-00894-5)