Merging issues deleting all changes in current branch
Asked by
Mehak
Hello,
I am not an expert with Bazaar and am running into a merge issue. I have a working branch "MyWorkingBranch" that I am on currently. I have changes checked into this branch. Our company has a trunk branch that MyWorkingBranch is based on. I want to merge trunk into "MyWorkingBranch" so I ran this command:
bzr merge bzr://ourserver
I have done a bzr revert for now but how do I merge trunk into my working branch without all my changes on my working branch being overwritten?
Thanks!
Question information
- Language:
- English Edit question
- Status:
- Expired
- For:
- Bazaar Edit question
- Assignee:
- No assignee Edit question
- Last query:
- Last reply:
To post a message you must log in.