Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-18 Thread Brandon McCaig
Jagan: On Fri, Mar 14, 2014 at 1:11 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Don't know what happen, I'm unable to join #git channel [23:40] Jagan hi [23:40] == Cannot send to channel: #git I'm not sure if this is the problem that you were having, but #git on freenode is NickServ

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-18 Thread Brandon McCaig
Jagan: On Fri, Mar 14, 2014 at 12:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Hi, Hello, I have two branch in one repo that I need to maintain for 2 different deliveries. Say branch1 and branch2 in test.git repo. test.git - branch1 foo_v1/text.txt foo_v2/text.txt -

Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
Hi, I have two branch in one repo that I need to maintain for 2 different deliveries. Say branch1 and branch2 in test.git repo. test.git - branch1 foo_v1/text.txt foo_v2/text.txt - branch2 foo/text.txt branch1 is developers branch all source looks version'ed manner and branch2 is

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
Don't know what happen, I'm unable to join #git channel [23:40] Jagan hi [23:40] == Cannot send to channel: #git Can any one help! On Fri, Mar 14, 2014 at 11:09 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Hi, I have two branch in one repo that I need to maintain for 2 different

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in terms of dir_version/ then I need to apply on my local repo branch1, till now is fine then I need to apply same 10 patches on to my branch2 where source

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in terms of dir_version/ then I need to apply on my local repo branch1, till now

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 4:01 PM, Jagan Teki jagannadh.t...@gmail.com wrote: On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Suppose developer send 10 patches on branch1 where are changes in

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Jagan Teki
On Sat, Mar 15, 2014 at 2:07 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 4:01 PM, Jagan Teki jagannadh.t...@gmail.com wrote: On Sat, Mar 15, 2014 at 12:48 AM, Andrew Wong andrew.k...@gmail.com wrote: On Fri, Mar 14, 2014 at 1:39 PM, Jagan Teki jagannadh.t...@gmail.com

Re: Apply commits from one branch to another branch (tree structure is different)

2014-03-14 Thread Andrew Wong
On Fri, Mar 14, 2014 at 4:57 PM, Jagan Teki jagannadh.t...@gmail.com wrote: Mr.J git cherry-pick -X subtree=foo cc70089614de16b46c08f32ea61c972fea2132ce 14e9c9b20e3bf914f6a38ec720896b3d67f94c90 error: could not apply cc70089... A hint: after resolving the conflicts, mark the