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

Add ignore for other IDEs and add ignore for docs/.venv/ #4074

Closed
wants to merge 0 commits into from

Conversation

Kureii
Copy link
Contributor

@Kureii Kureii commented Oct 9, 2024

I edit git ignore for other IDEs. This is the first step to add support for cmake build and make the project available to more developers.

@Kureii
Copy link
Contributor Author

Kureii commented Oct 9, 2024

Are you okay with my plan?

Copy link
Member

@bjorn bjorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I'm curious what the CMake project would look like.

Note that Qbs can also generate Visual Studio project files (I haven't tested it) and that there is a Qbs extension for VS Code. So I think Qbs is quite available (though not sure about CLion or Xcode).

.gitignore Outdated
*.qbs.user*
*.pro.user.*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why we would need to ignore pro files again. You're not going to add back a qmake project, are you?

.gitignore Outdated
*.creator.*
*.autosave
*.pro.user
*.qbs.user
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be covered by the existing *.qbs.user* ignore rule, right?

.gitignore Outdated
@@ -7,8 +7,30 @@ default/
# Mac stuff
*.DS_Store

# IDE files
# QT Creator
*.user
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going to ignore *.user, then a bunch of ignore rules below are not needed.

.gitignore Outdated
@@ -7,8 +7,30 @@ default/
# Mac stuff
*.DS_Store

# IDE files
# QT Creator
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# QT Creator
# Qt Creator

@bjorn
Copy link
Member

bjorn commented Oct 9, 2024

Oh, and the commits from #4073 came back. Please rebase instead of merging upstream. :-)

@bjorn
Copy link
Member

bjorn commented Oct 9, 2024

Hmm, you do need to resolve the conflicts before doing git rebase --continue. Alternatively, if you rebase using git rebase -i upstream/master, then an editor will open where you can drop the changes that were already applied upstream, so you don't need to resolve conflicts in them (by deleting the relevant pick lines).

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.

2 participants