[jboss-dev-forums] [JBoss AS7 Development] - Re: How I work with github jboss-as

[David Lloyd]

David Lloyd [http://community.jboss.org/people/david.lloyd%40jboss.com] created the discussion

"Re: How I work with github jboss-as"

To view the discussion, visit: http://community.jboss.org/message/573666#573666

--------------------------------------------------------------
> Thomas Diesler wrote:
> 
> I don't rebase a branch that I've pushed to a public repo because it breaks forks that where taken from that branch. Instead I regularly merge the changes from master to my feature branch.
Rebasing doesn't really break forks of that branch, it just means that forks of that branch must in turn rebase before they can merge onto it.  Use one of the alternate forms of rebase:
git rebase [-i | --interactive] [options] [--onto <newbase>]
git rebase [-i | --interactive] [options] [--onto <newbase>] <upstream> [<branch>]  
               <upstream> [<branch>]
git rebase [-i | --interactive] [options] --onto <newbase> --root [<branch>]
       git rebase [-i | --interactive] [options] --onto <newbase>
            --root [<branch>]
You just have to be sure that git knows what commits you're moving, and what you're moving them on to.
--------------------------------------------------------------

Reply to this message by going to Community
[http://community.jboss.org/message/573666#573666]

Start a new discussion in JBoss AS7 Development at Community
[http://community.jboss.org/choose-container!input.jspa?contentType=1&containerType=14&container=2225]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/jboss-dev-forums/attachments/20101130/763988e9/attachment.html