search

Uncommon / Xit

Mac OS X Git GUI
Other
981 stars 46 forks source link

Pull clobbers local changes #459

Closed Uncommon closed 2 years ago

Uncommon commented 3 years ago

Pulling remote changes discards all local changes without warning.

This was supposed to be fixed in #267.

Uncommon commented 3 years ago

It looks like this happens when the pull involves a fast-forward merge.

Uncommon commented 2 years ago

Discussing in libgit2/libgit2#6105

Uncommon commented 2 years ago

Fixed (workaround) in d07bae27ff854067b08b3fbbaa5b4141c1003332