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

[Christof Thalhofer]

Am 14.02.2018 um 21:10 schrieb Adrien Prokopowicz:

> 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! :-)

This ignores own commits made to master but not already pushed. Also
local master is not updated.

As I think, better would be:

git checkout master
(switch to master branch)

git pull
(fetches differences from origin and updates local master branch)

(eventually push own commits)
git push

(now local and origin master are identical)

git checkout stable
(switch to stable branch)

git merge master
(merges own and other's commits into stable)

git tag vX.YY

git push

---

Right?


Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20180214/5ea1888d/attachment.sig>