isomorphic-git / isomorphic-git/isomorphic-git
Git overwrites local changes
- Dominant language
- JavaScript
- Stars
- 8.4k
- Forks
- 491
- Avg merge
- 2h 53m
- Merged PRs (30d)
- 7
Description
I am using the Node vesion, specifically version 0.78.4. I have noticed a behavior which doesn't match that of canonical Git.
I know there has been a few tickets about the behavior of `pull` and 3 way merges etc., but I don't think what I've found has been discussed yet - or was it?
This is the repro:
https://github.com/TomasHubelbauer/isogit-pull
1. Clone a repository
2. Go in and make a local change to a file, do not stage it
3. Go in and make a remote change to the same file, commit it
4. Pull the remote changes
Isomorphic-Git will discard the local changes to the file. I tried with and without the `fastForwardOnly` flag.
Canonical Git will error with conflicts encountered.
I am sure this must be known already so sorry in advance for filing dupes! Searching the issues for *pull conflicts* results in a lot of dependat issues and I don't know how to filter the bot out. :-)
Contributor guide
Assessment
This issue has not been assessed yet.