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

fixing tsconfig.json #2269

Merged
merged 1 commit into from
Mar 23, 2024
Merged

fixing tsconfig.json #2269

merged 1 commit into from
Mar 23, 2024

Conversation

GottZ
Copy link
Contributor

@GottZ GottZ commented Mar 16, 2024

as #2271 is fixing the linting error from #2266, this will fix another issue with tsconfig.json.

sourceMap and inlineSourceMap can't be combined technically.
image

@GottZ GottZ marked this pull request as ready for review March 17, 2024 08:40
GottZ added a commit to GottZ/obsidian-dataview that referenced this pull request Mar 17, 2024
…ithgu#2269)

sourceMap and inlineSourceMap don't go well together.
GottZ added a commit to GottZ/obsidian-dataview that referenced this pull request Mar 17, 2024
GottZ added a commit to GottZ/obsidian-dataview that referenced this pull request Mar 17, 2024
hand checked each change through my git client, built it, and ran it inside obsidian.
@GottZ GottZ marked this pull request as draft March 17, 2024 15:55
@GottZ GottZ changed the title fixing linter errors for the github pipeline fixing tsconfig.json Mar 17, 2024
@GottZ GottZ marked this pull request as ready for review March 17, 2024 16:52
@holroy
Copy link
Contributor

holroy commented Mar 17, 2024

Why have all these commits been forced pushed like this? (Instead of being a normal pull request?)

And do you have write access to this repository? Do you potentially know who has write access besides @blacksmithgu ?

@GottZ
Copy link
Contributor Author

GottZ commented Mar 18, 2024

Why have all these commits been forced pushed like this? (Instead of being a normal pull request?)

I know git pretty well.
essentially I'm only force pushing to my own fork.
if you do a pull request, as long as it is not merged yet, you can change 100% of the history that is to be pulled when a maintainer hits merge.
even amending or squashing your own commits, to reduce commit count, will result in requiring force pushes.
a force push is usually considered a bad thing, if you actually have people relying on your repo.
for example: if you would base your branches off my master, tomorrow your repo would likely experience the inability to pull from me, after I did another history rewrite.

as you can see, now this pull request just contains a single line change in a single commit.
when it's merged, it will forget about all the force pushes I did to my repo.

And do you have write access to this repository? Do you potentially know who has write access besides @blacksmithgu ?

sadly not.
I already fear that my pace is a little overwhelming.

GottZ added a commit to GottZ/obsidian-dataview that referenced this pull request Mar 20, 2024
…ithgu#2269)

sourceMap and inlineSourceMap don't go well together.
…ithgu#2269)

sourceMap and inlineSourceMap don't go well together.
@GottZ
Copy link
Contributor Author

GottZ commented Mar 22, 2024

@holroy i also rebase to master every time master is updated through merged pull requests.
if you'd plot it visually, my pull requests always look like they have just been made on top of the current master head.

@holroy
Copy link
Contributor

holroy commented Mar 22, 2024

Hmm... Personally I think your policy of force pushing the commits like that hides away some of the changes and the process of how one arrives at a given code version. But YMMV, and you're of course free to choose your way of doing stuff like this.

@blacksmithgu blacksmithgu merged commit 7f8338b into blacksmithgu:master Mar 23, 2024
3 checks passed
@GottZ GottZ deleted the fix-linting branch March 23, 2024 08:20
@Cephra
Copy link

Cephra commented Mar 26, 2024

@holroy a force push is necessary if you rebase your own commits locally, which have been already pushed before. Then there's a mismatch between your local state and remote state, which requires a force push.

@Cephra
Copy link

Cephra commented Mar 26, 2024

Also Hey @GottZ :)

@GottZ
Copy link
Contributor Author

GottZ commented Mar 26, 2024

Also Hey @GottZ :)

LOL! hi there. I definitely did not expect you here.

also.. to be fair, originally this was a PR changing tons of files.

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.

4 participants