-
I use the following in my `.gitconfig` [more info here](https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git)
```
[merge]
conflictstyle = diff3
```
This c…
subev updated
3 years ago
-
```
I have a program that creates reports based on the file system each night.
These files need to be archived over a long period. A typical file will
have roughly 50MB.
I have started using xdelta…
-
When there is a conflict in the one branch only (pulling conflicting commits), this plugin does not work. I will get `Conflict markers miss common base revision. Ensure you're using 'merge.conflictSty…
-
## Git features
- [ ] status
- [ ] stash
- [x] cherry-pick
- [ ] revert
- [ ] merge
- [x] 3-way merge
- [ ] diff3
- [ ] rebase
- [ ] diff
- [ ] show
- [ ] packfile compatibility
…
-
### Background
The [Guiffy SureMerge whitepaper](https://www.guiffy.com/SureMergeWP.html) by Bill Ritcher (developer of Guiffy) presents a set of interesting (as it terms them) "Pathological cases"…
-
```
nodeDiff3.merge(
"one\n22222\nthree\n44\nfive\n6666",
"one\ntwo\nthree\nfour\nfive\nsix",
"one\nTTTTTT\nthree\nF\nfive\nSSSSS"
)
```
currently returns
```
{
"conflict":…
-
Exclude the **obj/*** path in **.gitignore** being pushed accidentally.
-
I wonder whether there is a bug in [this line](https://github.com/quark0/darts/blob/f276dd346a09ae3160f8e3aca5c7b193fda1da37/cnn/operations.py#L102) in the `FactorizedReduce` function:
`out = torch…
-
Part of #8
The typical use case is:
- I re-use content from an upstream provider (typically as a starting point for content adaptation)
- I modify the content.
- Upstream makes changes
The problem
…
-
```
I have a program that creates reports based on the file system each night.
These files need to be archived over a long period. A typical file will
have roughly 50MB.
I have started using xdelta…