undo current-merge example

undo current-merge example

Examples

C:\jazz\testCLI>scm show status
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
  Component: (3010) "Component1"
    Baseline: (3011) 1 "Initial Baseline"
    Current Merge:
      Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
      Target: (3021) >---@  "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
    Outgoing:
      Change sets:
        (3021) >*--@  "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
    Incoming:
      Change sets:
        (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
        (3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
        (3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
        (3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM

C:\jazz\testCLI>scm list changes 3016
Change sets:
  (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt"
    Component: (3010) "Component1"
    Modified: 05-Nov-2015 01:36 PM
    Changes:
      ---c- (3014) \P\b.txt
      ---c- (3019) \P\c.txt

C:\jazz\testCLI>scm resolve current-merge -c 3014 -- 3010
Some of the changes could not be auto-resolved. You will have to merge them manually.

C:\jazz\testCLI>scm resolve current-merge -c 3014 -p -- 3010
Resolved changes successfully.

C:\jazz\testCLI>scm show status
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
  Component: (3010) "Component1"
    Baseline: (3011) 1 "Initial Baseline"
    Current Merge:
      Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
      Target: (3021) >---@  "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
    Outgoing:
      Change sets:
        (3021) >*--@  "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
    Incoming:
      Change sets:
        (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
        (3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
        (3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
        (3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM

C:\jazz\testCLI>scm undo current-merge -c 3014 -- 3010
Changes successfully undone.


video icon Video

Jazz.net channel
Software Education channel

learn icon Courses

IoT Academy
Skills Gateway

ask icon Community

Jazz.net
Jazz.net forums
Jazz.net library

support icon Support

IBM Support Community
Deployment wiki