Skip to content

Don't show file in both "winning" and "losing" #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oBusk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't show file in both "winning" and "losing" #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions red4-conflicts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,13 @@ impl TemplateApp {
// update vms
// add this file to all previous archive's losing files
for archive in archive_names.iter() {
if !self.archives.get(archive).unwrap().loses.contains(hash) {
self.archives.get_mut(archive).unwrap().loses.push(*hash);
let archive_vm = self.archives.get_mut(archive).unwrap();
if !archive_vm.loses.contains(hash) {
archive_vm.loses.push(*hash);
}
// remove from wins if previously marked as winning
if let Some(pos) = archive_vm.wins.iter().position(|w| w == hash) {
archive_vm.wins.remove(pos);
}
}
// add the current archive to the list of conflicting archives last
Expand Down