Databases
StackOverflow2013
Postsdbo
POCollaborating on fixing merge conflicts
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POCollaborating on fixing merge conflicts
    text
    copied!<p>Scenario: Have a branch per (active) release in git,</p> <p>Sequence is:</p> <ol> <li>Bob makes changes to <strong>R1</strong> , commits, pulls <strong>R1</strong> and pushes <strong>R1</strong> to shared. Does not update <strong>R2</strong> on shared.</li> <li>Jane makes changes to <strong>R1</strong> , commits.</li> <li>Jane pulls <strong>R1</strong> from shared, deals with any conflicts, pushes <strong>R1</strong>.</li> <li><em>Go to <strong>Step 1</strong> again for a few times</em></li> <li>Jane gets told they need to bring <strong>R2</strong> up-to-date with fixes from <strong>R1</strong></li> <li>Jane pulls <strong>R1</strong> and <strong>R2</strong> from shared</li> <li>Jane merges <strong>R1</strong> into <strong>R2</strong> locally. Merge conflicts in some area of code Bob's worked on.</li> </ol> <p>Jane must fetch R2 from shared and handle the merge before she can push. But, she doesn't know what to do with Bob's changes.</p> <p>Branches: <strong>R1</strong>, <strong>R2</strong></p> <pre><code> State of Shared Repository C1 - Bob | C2-+ - Jane | | | C3 - George | | | C4 C5 | - Bob | | C6 | - Jane [R1] | C7 - Alice [R2] </code></pre> <p>Bob and Jane make changes to <strong>R1</strong></p> <p>Jane then wants to merge <strong>R1</strong> into <strong>R2</strong> to update the latest release. She solves the merge conflicts caused by her changes, however she doesn't know how to solve the conflicts cause by the changes Bob made.</p> <p>Is there a way for Jane to use git and have Bob complete the merge? </p> <p>I know ideally, Bob would have already merged his changes into <strong>R2</strong>, but suppose that isn't the case.</p> <p>Possible workarounds (looking for something better)</p> <ol> <li>Jane calls Bob over to her desk and Bob then resolves the conflict. Difficult when telecommuting</li> <li>Jane saves conflicted file(s) and email to Bob, Bob fixes file and emails them back to Jane who then uses them in her commit.</li> </ol>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload