search

mapeditor / tiled

Flexible level editor
https://www.mapeditor.org/
Other
11.26k stars 1.76k forks source link

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

Closed Kureii closed 1 month ago

Kureii commented 1 month ago

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 commented 1 month ago

Are you okay with my plan?

bjorn commented 1 month ago

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

bjorn commented 1 month ago

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).