Merge behavior question

[Michael Smith]

Sean Kelley wrote:
> Hi,
>
> I have probably a basic question on merges, so please suffer my lack
> of knowing the obvious here.  But what determines on a merge what
> order of precedence is taken?  If after I clone a repo someone else
> pushes a change to remove a header, but in my clone I still need the
> header and so do not remove it, then I would assume by order of
> operation I need to do something to keep my include line in my change.
>   
You have chosen to take a changeset which removes that header. You must 
have had a good reason for doing that. The header is still there in your 
history. You can get it back if you want.
-- 

*Michael Smith*