[Gambas-user] Question again about git in the aim of next Gambas release

[Adrien Prokopowicz]

Le 14/02/2018 à 20:44, Benoît Minisini a écrit :
> Hi,
> 
> OK, thanks to Tobias, I got the command to create a git tag.
> 
> $ git tag v3.11.0 <3.11.0-establishing commit>
> 
> But how can I make the 'stable' branch fully equal to the 'master' 
> branch in one shot?
> 
> I want to achieve: master -> stable -> 3.11.0 tag.
> 

You have to switch to the stable branch, and then merge the master 
branch into stable :

$ git checkout stable # Switch to 'stable' branch
$ git merge master # Merge master into stable

If the stable branch has no commits on its own (it shouldn't), then git 
will simply fast-forward to the latest commit. :-)

As a side note, the 'git merge' command merges your local 'master' 
branch, not the remote one, so if it is not up to date you can miss some 
commits made by others.

If you want to merge the remote branch instead, you can do the following :

$ git checkout stable # Switch to 'stable' branch
$ git pull origin master # Merge origin/master into stable

Hope this helps! :-)

-- 
Adrien Prokopowicz