Hi Gaia, On 05/07/17 11:35, Gaia Clary wrote: > I followed advise from IRC and documentation from git and i ended up > doing this: > > git checkout master > git fetch > git pull --rebase
git pull also does a fetch, so the first fetch isn't necessary, unless you want to see what the pull is going to do before actually pulling. > git checkout blender2.8 > git merge master After merging you also have to commit, otherwise you'll loose your merge. Of course after this don't forget to test & push. > Then i tried again to merge master into blender2.8 > However all my recent changes in master still do not > show up in blender2.8 regardless what i try. You can use 'gitk' or 'git log --graph' to see what merge commit was created. Cheers, -- Sybren A. Stüvel https://stuvelfoto.nl/ https://stuvel.eu/
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Bf-committers mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-committers
