On Wednesday, 4 November 2015 at 00:34:08 UTC, Chris wrote:
What I tried to do was to update my branch to the latest
version of master and then send my humble fix back to my
(updated) branch and up to master. The whole thing about "topic
branch" and the array of commands that follow shows (me) that
it is not straight forward. I have to look up/ask every time
"Sorry, how do I do that again" - "rebase, upstream blah".
Thing is, I expected github (not git) to be easier, like
clicking on "Update branch", then
Keeping changes updated with master is not easy whether it is
github or some other tool. If your branch and master both have
changes you risk conflicts and those conflicts must be resolved.
If you have a fix for your branch, then fix it.
These are two separate operations and can be done independently
of the other. If your branch can be merged cleanly then a rebase
is not necessary; if it can't be merged cleanly you'll need to be
in your dev environment. Having a UI do a rebase when it is clean
for you might be nice, but it won't do you any good when real
work is necessary (unless you want GitHub to be a full
development environment).
