Launchpad itself

Merging Problem of branch - sub-branch.

Hi Reader,

Suppose my partner and I are working on a project.The main Branch is A.

A has 2 children branches X and Y.

If my project partner is working on the project with X branch and I am on Y branch of the same project.

I knw that I can commit n work on my branch only.

What If i want to have the changes done on X branch or in main A branch ?

Evrytime I have to create a new branch and take the latest code of A ?

Is there any way for taking latest changes to my Y branch, so i keep myself updated ?

Thanks for the time.

Question information

Language:
English Edit question
Status:
Solved
For:
Launchpad itself Edit question
Assignee:
No assignee Edit question
Solved by:
Diogo Matsubara
Solved:
Last query:
Last reply:
Revision history for this message
Best Diogo Matsubara (matsubara) said : 		#1

You can "bzr merge X" or "bzr merge A" from inside your branch Y

You can find more details instructions in http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#sharing-with-peers

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) said : 		#2

Yes sir, I got it.

Thanks a lot.

Have a nice time ahead.

Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) said : 		#3

Thanks Diogo Matsubara, that solved my question.