Re: push patch for issue 2679

[David Kastrup]

David Nalesnik <address@hidden> writes:

> David,
>  
>
>     
>     >
>     > So, in this case, would I do something like:
>     >
>     > git pull -r
>     >
>     > then submit a new patch set?
>     
>     
>     That's probably the easiest way.  You'll likely get a merge
>     conflict
>     with instructions.  Personally, I use Emacs and
>     
>     M-x smerge-ediff RET
>     
>     on the problematic file(s) for fixing the merge conflicts.  But
>     any
>     editor should do if you search for <<<<< the merge conflict marks.
>     
>
> OK, I get the merge conflict.
>
> Is there any reason I can't manually remove the markers for the merge
> conflict, namely the lines:
>
>  <<<<<<< HEAD
>
> =======
>
>>>>>>>> Function for overriding broken spanners

If the result is the intended result, sure.  You are getting the merge
conflict because the history introduced changes on the same lines as you
did.  If both changes only added lines, the conflict mainly consists in
making a decision which lines are to go first in the resulting file.

> then continue on with the instructions I've been given:
>
> git rebase --continue

Likely.

-- 
David Kastrup