Re: Git: to merge or not to merge.

[John Mandereau]

On 2008/10/27 12:03 +0100, Francisco Vila wrote:
> Thank you Trevor, could you show me an example?
> Suppose I'd have the two branches freshly pulled, and I wanted to
> update a file after some changes in master.
> 
> I could: merge master, update my file, edit the committish of that
> file to the merge commit, and push.

This is a safe approach.


> Or, I could first update my file, the merge master, then edit the
> committish, then push.

This works if you make sure the file you edited hasn't changed after
pulling, otherwise you'd write an inaccurate committish in the
translated file, thus making check-translation judges more up to date
than it is.


> How does cherry-pick apply here?

As Trevor answered, it doesn't.

Cheers,
John