Comments (3)
There is no difference besides the blank lines. I was expecting that the flag --ignore-space-change would work for that, but it does not, and there is still a merge conflict:
So I suspected the flag was not working, or even not reaching all merging situation. However, when merging the same triple directly via git, invoking git's own flag, the result was the same:
The git manual says that "[...]the option ignores whitespace completely when comparing lines[...]"
I believe that they strictly consider whitespace, not including blank lines as in the example.
So, in principle, we have two options:
- Assume that this is correct, and leave as it is.
- Build upon that and include blank lines.
What do you think @pauloborba @jvcoutinho ?
from jfstmerge.
excellent point @guilhermejccavalcanti!
I believe that we should keep the git behavior, and explicitly explain that in the text that explains the flag --ignore-space-change
But have you tried the git option -Xignore-space-change too? I believe this should be the option we should use (look for ignore-space-change here https://git-scm.com/docs/git-diff) for comparison purposes.
Deleting a line doesn't seem to be considered a space change.
from jfstmerge.
But have you tried the git option -Xignore-space-change too? I believe this should be the option we should use (look for ignore-space-change here https://git-scm.com/docs/git-diff) for comparison purposes.
Same merge conflict with that option.
from jfstmerge.
Related Issues (20)
- Replace REGEX on Initialization Blocks Handler to check var declarations
- IOException when attempting to create log
- general renaming handler should not be configurable and should not invoke renaming strategies
- "getMostAccurateMatchForNonAbstractMethods" method returning innapropiate results HOT 2
- should import declarations reach renaming handlers? HOT 5
- duplicated commas when merging enums
- Log and statistics files not updating after every execution
- Parameter to enable/disable unstructured merge output
- Trocar Travis CI por GitHub Actions
- Investigar e corrigir erro de build no Travis CI
- Consider left, base and right trees at the same time when superimposing instead of merging trees in pairs.
- Regression Tests instead of shelltests
- Initialization Blocks Multiple Handler (-hibmb/--handle-initialization-blocks-multiple-blocks) is not present in the S3m.jar HOT 3
- MINE conflict marker not in its own line
- `NullPointerException` at renaming handler
- Duplicated Prefix
- TypeAmbiguityError Handler should report a conflict in a few situations in which import package is replaced by import of individual members
- s3m reporting inconsistent number of conflicts and renaming conflicts
- s3m reporting wrong results when merging initialization blocks from different innerclasses
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from jfstmerge.