Tek-Tips is the largest IT community on the Internet today!

Members share and learn making Tek-Tips Forums the best source of peer-reviewed technical information on the Internet!

Register Log in
  • Congratulations IamaSherpa on being selected by the Tek-Tips community for having the most helpful posts in the forums last week. Way to Go!

merging branches

Status
Not open for further replies.
hosrow

hosrow

Programmer
May 18, 1999
16
US
I have project 'Prod' file 'F1' with 5 items in its history. I have the same file in project 'Rel2' with 3 items in its history. What I need to do is to collaps my 'Rel2' file 'F1' onto the 'Prod' project file 'F1' and have it contain all the history in 'Prod' project file 'F1' as well as 'Rel2' project file 'F1'. Project 'Rel2' file 'F1' was a branch of project 'Prod' file 'F1'. As I create releases (Relx projects), modify, test and implement them, I need to collaps the contents back into project 'Prod' and have it carry over all the history that it contained in the branch (Relx).

Can someone help please? Thanks much.
 
Sort by date Sort by votes
Don't think you can merge them and keep both histories. Whenever we take branches we merge changes into both the current dev branch and the release_X branch.
 
Upvote 0 Downvote
Status
Not open for further replies.

Similar threads

Teddi
  • Locked
  • Question
Merging 2 projects
Replies
1
Views
52
sqlpro
sqlpro
byrne1
  • Locked
  • Question
Merging Two Databases?!?
Replies
1
Views
46
thenetwrker
thenetwrker
llafretaw
  • Locked
  • Question
Clueless indv needs help with merging existing & previous systems
Replies
1
Views
44
Teddi
Teddi

Part and Inventory Search

Sponsor

Back
Top