×
INTELLIGENT WORK FORUMS
FOR COMPUTER PROFESSIONALS

Contact US

Log In

Come Join Us!

Are you a
Computer / IT professional?
Join Tek-Tips Forums!
  • Talk With Other Members
  • Be Notified Of Responses
    To Your Posts
  • Keyword Search
  • One-Click Access To Your
    Favorite Forums
  • Automated Signatures
    On Your Posts
  • Best Of All, It's Free!

*Tek-Tips's functionality depends on members receiving e-mail. By joining you are opting in to receive e-mail.

Posting Guidelines

Promoting, selling, recruiting, coursework and thesis posting is forbidden.

Students Click Here

merging branches

merging branches

merging branches

(OP)
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.

RE: merging branches

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.

Red Flag This Post

Please let us know here why this post is inappropriate. Reasons such as off-topic, duplicates, flames, illegal, vulgar, or students posting their homework.

Red Flag Submitted

Thank you for helping keep Tek-Tips Forums free from inappropriate posts.
The Tek-Tips staff will check this out and take appropriate action.

Reply To This Thread

Posting in the Tek-Tips forums is a member-only feature.

Click Here to join Tek-Tips and talk with other members! Already a Member? Login

Close Box

Join Tek-Tips® Today!

Join your peers on the Internet's largest technical computer professional community.
It's easy to join and it's free.

Here's Why Members Love Tek-Tips Forums:

Register now while it's still free!

Already a member? Close this window and log in.

Join Us             Close