John Goerzen <[EMAIL PROTECTED]> writes:

> My question here is: how do you keep the feature branches up-to-date
> with upstream?  Are you rebasing or merging?
> I have a couple of simple scripts that will do a git merge in each
> feature branch, and then another one that will merge each feature branch
> to master.  This has been working well for me.
> The problem with rebasing, of course, is that it makes it difficult for 
> others to work on the project with you.

Out of curiosity (and this is one of the places where I'm just a Git
newbie), why would I ever want to rebase and not merge?  I'm currently
merging and it works great.  I'm not sure what the advantage of rebasing
instead would be.

Russ Allbery ([EMAIL PROTECTED])             <>

vcs-pkg-discuss mailing list

Reply via email to