{"thread":{"id":"36150","subject":"Committing a change from one branch another branch","startedAt":"2014-03-13T09:56:24Z","lastAt":"2014-03-14T09:34:25Z","messageCount":4,"participants":["Jagan Teki","Andreas Schwab","Brandon McCaig"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"236664","messageId":"CAD6G_RRQVDxQj==-2vAT3WCiYMC=BmZhi__JWi4yy86Uaoa-og@mail.gmail.com","threadId":"36150","inReplyTo":null,"subject":"Committing a change from one branch another branch","fromName":"Jagan Teki","fromEmail":"jagannadh.teki@gmail.com","sentAt":"2014-03-13T09:56:24Z","receivedAt":"2014-03-13T09:56:24Z","isPatch":false,"sender":{"key":"jagannadh.teki@gmail.com","avatar":null},"body":"Hi,\n\nI have two branches.\n- master-b1\n- master-b2\n\nSuppose I'm in master-b1 then did a change\non master-b1\n$ git add test/init.c\n$ git commit -s -m \"init.c Changed!\"\n$ git log\nAuthor: Jagan Teki \nDate: Thu Mar 13 00:48:44 2014 -0700\n\ninit.c Changed!\n\n$ git checkout master-b2\n$ git log\nAuthor: Jagan Teki \nDate: Thu Mar 13 00:48:44 2014 -0700\n\ninit.c Changed!\n\nHow can we do this, any idea?\n\n-- \nJagan.\n"},{"id":"236665","messageId":"87bnxav1oy.fsf@igel.home","threadId":"36150","inReplyTo":"CAD6G_RRQVDxQj==-2vAT3WCiYMC=BmZhi__JWi4yy86Uaoa-og@mail.gmail.com","subject":"Re: Committing a change from one branch another branch","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2014-03-13T10:21:33Z","receivedAt":"2014-03-13T10:21:33Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Jagan Teki writes:\n\n> How can we do this, any idea?\n\ngit cherry-pick\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"236670","messageId":"CANUGeEZc8BoV0MxUGRRGc8SK=-xB2YXoEkRkBTyGZ8FxSjnVTQ@mail.gmail.com","threadId":"36150","inReplyTo":"CAD6G_RRQVDxQj==-2vAT3WCiYMC=BmZhi__JWi4yy86Uaoa-og@mail.gmail.com","subject":"Re: Committing a change from one branch another branch","fromName":"Brandon McCaig","fromEmail":"bamccaig@gmail.com","sentAt":"2014-03-13T15:36:06Z","receivedAt":"2014-03-13T15:36:06Z","isPatch":false,"sender":{"key":"bamccaig@gmail.com","avatar":"https://gravatar.com/avatar/05b01f2b62a5ddbaa1946579266a8d9e970fed0c0b3c20e8d42aca973c31531c?d=mp&s=160"},"body":"Jagan:\n\nOn Thu, Mar 13, 2014 at 4:56 AM, Jagan Teki wrote:\n> Hi,\n\nHello,\n\n> I have two branches.\n> - master-b1\n> - master-b2\n>\n> Suppose I'm in master-b1 then did a change\n> on master-b1\n> $ git add test/init.c\n> $ git commit -s -m \"init.c Changed!\"\n> $ git log\n> Author: Jagan Teki \n> Date: Thu Mar 13 00:48:44 2014 -0700\n>\n> init.c Changed!\n>\n> $ git checkout master-b2\n> $ git log\n> Author: Jagan Teki \n> Date: Thu Mar 13 00:48:44 2014 -0700\n>\n> init.c Changed!\n>\n> How can we do this, any idea?\n\nWhat you're asking is ambiguous and vague. The example output that you\ngive doesn't even really make sense. You need to give more details\nabout what you have and what you want to do to get proper help.\n\nOr join #git on irc.freenode.net for real-time help if you aren't sure\nhow to explain it.\n\nRegards,\n\n\n-- \nBrandon McCaig \nCastopulence Software \nBlog \nperl -E '$_=q{V zrna gur orfg jvgu jung V fnl. }.\nq{Vg qbrfa'\\''g nyjnlf fbhaq gung jnl.};\ntr/A-Ma-mN-Zn-z/N-Zn-zA-Ma-m/;say'\n"},{"id":"236721","messageId":"CAD6G_RT5mBWUKz18ZkSQkKiMnz8WXRK7scb+_xAscYQX4zR9xw@mail.gmail.com","threadId":"36150","inReplyTo":"CANUGeEZc8BoV0MxUGRRGc8SK=-xB2YXoEkRkBTyGZ8FxSjnVTQ@mail.gmail.com","subject":"Re: Committing a change from one branch another branch","fromName":"Jagan Teki","fromEmail":"jagannadh.teki@gmail.com","sentAt":"2014-03-14T09:34:25Z","receivedAt":"2014-03-14T09:34:25Z","isPatch":false,"sender":{"key":"jagannadh.teki@gmail.com","avatar":null},"body":"Hi Brandon McCaig,\n\nOn Thu, Mar 13, 2014 at 9:06 PM, Brandon McCaig wrote:\n> Jagan:\n>\n> On Thu, Mar 13, 2014 at 4:56 AM, Jagan Teki wrote:\n>> Hi,\n>\n> Hello,\n>\n>> I have two branches.\n>> - master-b1\n>> - master-b2\n>>\n>> Suppose I'm in master-b1 then did a change\n>> on master-b1\n>> $ git add test/init.c\n>> $ git commit -s -m \"init.c Changed!\"\n>> $ git log\n>> Author: Jagan Teki \n>> Date: Thu Mar 13 00:48:44 2014 -0700\n>>\n>> init.c Changed!\n>>\n>> $ git checkout master-b2\n>> $ git log\n>> Author: Jagan Teki \n>> Date: Thu Mar 13 00:48:44 2014 -0700\n>>\n>> init.c Changed!\n>>\n>> How can we do this, any idea?\n>\n> What you're asking is ambiguous and vague. The example output that you\n> give doesn't even really make sense. You need to give more details\n> about what you have and what you want to do to get proper help.\n>\n> Or join #git on irc.freenode.net for real-time help if you aren't sure\n> how to explain it.\n\nI tried #git irc channel, looks like I'm facing some firewall issue on my end.!\nOK - Let me explain my query again.\n\nI've a git repository with 2 branches.\n- master-b1\n- master-b2\n\nI have to work both these branches since I need two different deliveries.\n\nmaster-b1 have a contents of\njoo_v1/test.txt\njoo_v2/test.txt\n\nmaster-b2\njoo/test.txt\n\nHere, joo_v2 on master-b1 is same as joo on master-b2 means the latest updates\non master-b1 with _ becomes on master-b2\n\nSuppose, if user is change the contents on joo_v2 on master-b1 will change\nthe contents on joo on master-b2 (files contains particular directories are same\nname with same contents - joo_v2/test.txt and joo/text.txt)\n\nThe moment user commit the change on master-b1 will create a commit on master-b2\n\nPlease let me know if you still need any more information.\nI will come to IRC soon, for more discussion.\n\nthanks!\n-- \nJagan.\n"}]}