On Wed, 2013-03-27 at 11:30 -0400, Dale R. Worley wrote:
> I do not see why merging a branch in will cause all lines in the file
> to be marked as changed by the user who did the merge (from whose
> branch the merge was done). Assuming the reformatting in the master
> and the reformatting in the developer's branch is exactly the same,
> when the developer goes to merge his changes back into master, only
> lines that he changed "for real" will be different -- lines that were
> changed only by reformatting will be changed in exactly the same way
> in both sources, and presumably "git blame" does not consider them to
> be changed by the merge.
Ah. Interesting. Maybe my problem is I stopped part-way through and
extrapolated incorrectly. Looking at the _branch_ I see everything is
modified by the developer.
But you're saying if I merge back to master then the changes already on
master will be preferred and all those lines will be blamed on the
reformat user, just as I hoped. That sounds reasonable.
Let me try that.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.