UI `Pull` Overwtites Modified Files

[JohnsonLo00]

Version: 1.11.0

This issue could be reproduced as follows:

1. Create changes locally, reaching out modified files, whether staged or unstaged;
2. Do not commit these modified files;
3. Ensure there are also changes in the remote repository, which differ from those in the local repository;
4. Run the UI Pull.

---

In my experience, as the modified files exist locally, running UI Pull just overwrote all these files without any return, no matter whether there is conflict between local and remote changes.

Basically in Git system, running git pull in similar case would raise error with message like

error: Your local changes to the following files would be overwritten by merge:
        ...
Please commit your changes or stash them before you merge.
Aborting

Yep, git stash is the solution for that. Whereas as the #1267 mentioned, lg2's commands works seperately to git UI, and there is no options related to stash in git UI.

At that stage, I supposed to the error above to be returned and then tried clicking the UI Pull, and finally met with such a problem.

By the way, lg2 reflog cannot be called in built-in terminal, neither. So now I have no idea what is this issue about and how to recover those missing modified files.

[bummoblizard]

This is unexpected. If there is any conflict, the pull should abort like you described.

Let me investigate the issue and get back to you

[bummoblizard]

The app tries to automatically merge the remote branch into your local branch. When conflicts can't be automatically resolved, the app should write the conflicts to the file and let the user resolves. Can you try 'lg2 log' in the terminal and check if it really merged the code for you?

Here's the relevant code:

codeapp/SwiftGit2/SwiftGit2/Repository.swift

Lines 434 to 528 in db5f282

	private func mergeBranchIntoCurrentBranch(branch: Branch, signature: Signature) throws {
	let localBranch = try self.currentBranch()
	if localBranch.commit.oid.description == branch.commit.oid.description {
	return
	}
	let analysis = try analyzeMerge(fromBranch: branch)
	if (analysis.contains(.upToDate)){
	// Do nothing
	return
	}else if (analysis.contains(.fastForward) || analysis.contains(.unborn)){
	// Fast-forward branch
	let newReference = try updateReferenceTarget(
	reference: localBranch,
	newTarget: branch.commit.oid,
	message: "merge \(branch.name): Fast-forward"
	)
	try self.checkout(newReference, strategy: .Force).get()
	}else if analysis.contains(.normal) {
	// Do normal merge
	let localTree = try safeTreeForCommitId(localBranch.commit.oid).get()
	let remoteTree = try safeTreeForCommitId(branch.commit.oid).get()
	// TODO: Find common ancestor
	let ancestorTree: Tree? = nil
	// Merge
	let index = try mergeTree(tree: localTree, otherTree: remoteTree, ancestor: ancestorTree)
	defer { git_index_free(index) }
	// Check for conflict
	if (git_index_has_conflicts(index) != 0) {
	var mergeOptions = {
	let pointer = UnsafeMutablePointer<git_merge_options>.allocate(capacity: 1)
	git_merge_options_init(pointer, UInt32(GIT_MERGE_OPTIONS_VERSION))
	return pointer.move()
	}()
	var checkoutOptions = {
	let pointer = UnsafeMutablePointer<git_checkout_options>.allocate(capacity: 1)
	git_checkout_options_init(pointer, UInt32(GIT_CHECKOUT_OPTIONS_VERSION))
	return pointer.move()
	}()
	let strategy: CheckoutStrategy = [CheckoutStrategy.Safe, CheckoutStrategy.AllowConflicts]
	checkoutOptions.checkout_strategy = strategy.gitCheckoutStrategy.rawValue
	var annotatedCommit: OpaquePointer? = try unsafeAnnotatedCommit(oid: branch.commit.oid)
	git_merge(self.pointer, &annotatedCommit, 1, &mergeOptions, &checkoutOptions)
	git_annotated_commit_free(annotatedCommit)
	throw NSError(
	domain: libGit2ErrorDomain,
	code: 1,
	userInfo: [
	NSLocalizedDescriptionKey: "Conflicts with target branch are found.",
	]
	)
	}
	let newTree = try writeUnsafeTree(tree: index)
	// Create merge commit
	let parents = [
	try commit(localBranch.commit.oid).get(),
	try commit(branch.commit.oid).get()
	]
	// FIXME: This is stepping on the local tree
	_ = try self.commit(
	tree: newTree.oid,
	parents: parents,
	message: "Merge branch \(localBranch.name)",
	signature: signature
	).get()
	let updatedBranch = try self.currentBranch()
	try self.checkout(updatedBranch, strategy: .Force).get()
	}else {
	throw NSError(
	domain: libGit2ErrorDomain,
	code: 1,
	userInfo: [
	NSLocalizedDescriptionKey: "Failed to merge branch",
	]
	)
	}
	}

[JohnsonLo00]

Thanks for that detail.

Can you try 'lg2 log' in the terminal and check if it really merged the code for you?

I checked it but there is no record of merging and no remark of conflict in concrete files.

---

Let me show you a test. Referred repo is here.

Due to the limitation of files to be uploaded in issue comment, the detail of test is temporally showed in wiki of the tested repo.