[git-users] Merging workflow
Hi all, I have a branch called daviddoria. From this branch, I created multiple branches (Project1, Project2, and Project3). I want to have a branch where I can use everything from all three project branches. My question is - if I merge Project1 into daviddoria, won't this also affect Project2 and Project3 (i.e. the next time Project2 and Project3 are pulled they will get all of the changes made to Project1)? If that is correct, how can I make a branch that contains all of the changes to all of the projects but still keep all of the projects separate from each other? Thanks! David -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Merging workflow
Hi, David I have this very same question (but I think you expressed it way better) I am trying to figure it out. If I can discover the answer, I´ll post here. Thanks. = Daniel Trezub http://www.gameblogs.com.br On 12 August 2010 11:22, David Doria daviddo...@gmail.com wrote: Hi all, I have a branch called daviddoria. From this branch, I created multiple branches (Project1, Project2, and Project3). I want to have a branch where I can use everything from all three project branches. My question is - if I merge Project1 into daviddoria, won't this also affect Project2 and Project3 (i.e. the next time Project2 and Project3 are pulled they will get all of the changes made to Project1)? If that is correct, how can I make a branch that contains all of the changes to all of the projects but still keep all of the projects separate from each other? Thanks! David -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.comgit-users%2bunsubscr...@googlegroups.com . For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Merging workflow
Create a new branch all (or some other more descriptive name) based on daviddoria, then merge the other projects into it. You have your combined branch, and all of the source branches won't be polluted by each others commits. On Aug 12, 2010, at 7:22 AM, David Doria daviddo...@gmail.com wrote: Hi all, I have a branch called daviddoria. From this branch, I created multiple branches (Project1, Project2, and Project3). I want to have a branch where I can use everything from all three project branches. My question is - if I merge Project1 into daviddoria, won't this also affect Project2 and Project3 (i.e. the next time Project2 and Project3 are pulled they will get all of the changes made to Project1)? If that is correct, how can I make a branch that contains all of the changes to all of the projects but still keep all of the projects separate from each other? Thanks! David -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
