Re: [Condor-devel] how to merge manual

["Nathan W. Panike" <nwp@xxxxxxxxxxx>]

On Mon, Aug 01, 2011 at 11:39:00PM -0500, Peter Keller wrote:
> On Mon, Aug 01, 2011 at 10:47:19PM -0500, Nathan Panike wrote:
> > And you only get conflicts if you and another team member have made changes
> > to the same part of a document or code. 
> 
> That's not true.
> 
> For example, if I want to do: V7_6_0-branch -> V7_6-branch -> master
> 
> And I do it this way, which is our recommended way:
> 
> git branch status
> * V7_6_0-branch
> git pull
> git push origin V7_6_0-branch
> git checkout V7_6-branch
> git pull
> git merge V7_6_0-branch [no conflicts]
> git push origin V7_6-branch
> LABEL_A
> git checkout master
> git merge V7_6-branch [BOOM! Conflicts in the src through my fault or other.]
> fix conflicts, retest, could take hours.
> git add (piles of crap)
> git commit -m "Merged V7_6-branch into master"
> git pull
> git push origin master
> 

Why is it the recommended way?  It is stupid.

What I do:

BEGIN # Set up once, not every time
git config remote.origin.push V7_6_0-branch:V7_6_0-branch
git config remote.origin.push V7_6-branch:V7_6-branch
git config remote.origin.push master:master

START
git config remote.origin.push 
git checkout V7_6-branch
git merge V7_6_0-branch
git checkout master
git merge V7_6-branch
git push --dry-run origin # To check whether it will work
# If not, fetch, reset master and V7_6-branch, then rebase V7_6_0-branch;  goto START
git push origin

Nathan Panike

> 
> Now, suppose Karen, through dumb luck, wants to do a doc merge of V7_6-branch
> to master at the LABEL_A time step. 
> 
> Now she gets src conflicts that she had nothing to do with and gets
> very angry.
> 
> This happens about once every 5 merge sequences I do. Mostly because
> people don't do the merge sequence properly. But, I've hit LABEL_A
> legitimately as a race condition (more than a dozen times at least)
> with someone taking a while to fix the merge conflict and I happen to
> perform the merge sequence and it the exact same conflict.  Then both
> of us are trying to solve the merge conflict, causing more conflicts!
> 
> -pete
> Now, suppose Karen, through dumb luck, wants to do a doc merge of V7_6-branch
> to master at the LABEL_A time step. 
> 
> Now she gets src conflicts that she had nothing to do with and gets
> very angry.
> 
> This happens about once every 5 merge sequences I do. Mostly because
> people don't do the merge sequence properly. But, I've hit LABEL_A
> legitimately as a race condition (more than a dozen times at least)
> with someone taking a while to fix the merge conflict and I happen to
> perform the merge sequence and it the exact same conflict.  Then both
> of us are trying to solve the merge conflict, causing more conflicts!
> 
> -pete