Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[higgins-dev] Merging in eclipse

Here's what I did to make changes in my M0-8 branch and merge with the HEAD branch

1) Switch project(s) to M0-8 branch (right-click project(s), Team, Switch To Another Branch Or Version..., Select M0-8 branch from list.)
2) Make code changes
3) Switch project(s) back to HEAD branch
4) Merge 
4.1) right-click project(s), Team, Merge,
4.2) set Branch to be merged to M0-8
4.3) set Comon Base version to Root_M0-8
4.4) click Finish and review changes in synch window.
4.5) in synch tree view: select all changes, right-click, Merge.

Jim

 



Back to the top