#20136: Various meataxe build issues
-------------------------------------------------+-------------------------
Reporter: jdemeyer | Owner:
Type: defect | Status: new
Priority: major | Milestone: sage-7.1
Component: packages: optional | Resolution:
Keywords: | Merged in:
Authors: | Reviewers:
Report Upstream: Reported upstream. Developers | Work issues:
acknowledge bug. | Commit:
Branch: | Stopgaps:
Dependencies: |
-------------------------------------------------+-------------------------
Comment (by jdemeyer):
Replying to [comment:15 SimonKing]:
> It seems that in most cases the change is in how comments are formatted
and whether tabs are used. This makes rebasing my patches a mess, and for
no good reason (I mean, it isn't so much about codes but about
formatting!).
If it's only a matter of spacing, `git merge` has options for dealing with
that:
{{{
ignore-space-change, ignore-all-space, ignore-space-at-eol
Treats lines with the indicated type of whitespace change
as unchanged for the sake of a three-way merge. Whitespace changes mixed
with
other changes to a line are not ignored. See also git-
diff(1)-b, -w, and --ignore-space-at-eol.
· If their version only introduces whitespace changes to
a line, our version is used;
· If our version introduces whitespace changes but their
version includes a substantial change, their version is used;
· Otherwise, the merge proceeds in the usual way.
}}}
--
Ticket URL: <http://trac.sagemath.org/ticket/20136#comment:16>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
