Skip to content
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.

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

Commit missing details for #163 #169

Merged
merged 1 commit into from
May 10, 2024
Merged

Conversation

bjornoleh
Copy link
Contributor

@bjornoleh bjornoleh commented May 10, 2024

Remove branch.txt from project, and commit Xcode-generated removal of 'Created by' for SettingsRootViewModel.swift

@MikePlante1 MikePlante1 requested a review from bjorkert May 10, 2024 13:26
@bjornoleh
Copy link
Contributor Author

bjornoleh commented May 10, 2024

Tested with Xcode build, builds ok, with no uncommitted changed after the build.

Before the commit, Xcode caused uncommitted changes to SettingsRootViewModel.swift, by removing the authorship comments (I thought it was the other way around first...). Not sure why Xcode seems to want to remove this?

git diff
diff --git a/FreeAPS/Sources/Modules/Settings/View/SettingsRootViewModel.swift b/FreeAPS/Sources/Modules/Settings/View/SettingsRootViewModel.swift
index a93e9b8c..3392b7d3 100644
--- a/FreeAPS/Sources/Modules/Settings/View/SettingsRootViewModel.swift
+++ b/FreeAPS/Sources/Modules/Settings/View/SettingsRootViewModel.swift
@@ -1,10 +1,3 @@
-//
-//  SettingsRootViewModel.swift
-//  FreeAPS
-//
-//  Created by Jonas Björkert on 2024-05-09.
-//
-
 import Foundation
 import SwiftUI
 import Swinject

@marionbarker marionbarker self-requested a review May 10, 2024 13:50
@marionbarker
Copy link
Contributor

The branch.txt removal should not be necessary. I do not understand the other behavior but can confirm it.

  • The branch.txt file is only there if it was there before the pull
    • Futhermore, @bjorkert added it to the .gitignore file

I just did a fresh pull (in an old repo)

  • to make sure I got a good build with no debris:
  • I did a clean build folder
  • I closed the workspace file in Xcode (second time through, I quit Xcode)
  • I removed Derived files
  • built to a phone and did git status after build completed
  • The file Bjorn indicated has been modified.

Same behavior was observed with a fresh clone.

Configuration:
Last 3 commits in dev when I did this test:

dbd17fd3 (HEAD -> dev, origin/dev) Merge pull request #168 from nightscout/missing_Trio_renames
b0e4dedf Rename 3D icons to trio3D
9d2a1922 Issue template config.yml:Add missing Trio name for Discord server

@bjornoleh
Copy link
Contributor Author

The reason for the branch.txt changes is that the file was previously added to the project, but not properly removed. You can see that it is marked in red in the Xcode file browser without my commit.

@bjorkert
Copy link
Contributor

SettingsRootViewModel.swift is a mystery, but let's go with this if that is what xcode wants. Good find with the branch.txt!

@bjornoleh bjornoleh merged commit fa230e2 into dev May 10, 2024
@bjornoleh bjornoleh deleted the missing_details_from_PR163 branch May 10, 2024 17:15
@MikePlante1 MikePlante1 mentioned this pull request May 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants