> On 5 Nov 2016, at 9:58 pm, Rainer Müller <[email protected]> wrote: > >> On 2016-11-05 09:07, Mojca Miklavec wrote: >> # go to master and pull the latest changes >> git checkout master >> git pull --rebase >> >> # if you did your work on libpng in master, you are then set >> >> # else go to your libpng branch and rebase the changes on top of the >> latest master >> git rebase master >> # I don't want to give wrong instructions here, but I suspect that even >> # "git push origin master" works in this case > > With this, you would push the local branch master to the remote branch > master. If you want to push to a different remote name than what you > have locally, you need to use the localbranch:remotebranch syntax. > > https://help.github.com/articles/pushing-to-a-remote/ > > For beginners, it should probably be easier to always get the commits to > the local master first before pushing.
I don't think its a good idea to promote the idea of users working on the master branch. I agree its for beginners the easiest thing to do, and i am sure people will, but you will eventually start to run into the problem Ryan had of how to separately push unrelated changes. In my view its best to maintain master exactly as upstream, as then it provides a constant fixed reference you can make new branches from, which are then used for updates. These update branches will then only have in them the changes related to each piece of work. If you start to modify master, it gets hard fast to keep various different projects separate. Chris > > Rainer
