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

Improve functions index #767

Closed
wants to merge 9 commits into from
Closed

Improve functions index #767

wants to merge 9 commits into from

Conversation

olivroy
Copy link
Collaborator

@olivroy olivroy commented Aug 24, 2023

This PR: If you agree with both this and #768, just merge #768. git problems again

image

Also makes it easier to see that some things are not functions
image

Before:
image

@JanMarvin
Copy link
Owner

you might want to look into a few git clients. For instance on Linux I prefer to use gitg (but that's just a personal choice) and its available via homebrew (I have a custom build in my github folder). The issue is, that you open new branches from dirty ones.

git checkout main
git checkout -b dirty
git add somefile.R
git commit -m "some commit"
git checkout -b new # <- this carries the earlier commits from dirty over

In such a case, if you end up in new:

git checkout main
git checkout -b new2
git cherry-pick ... # the commit you want to carry over (I like to use gitg for this, but every basic git client should do it)

@olivroy
Copy link
Collaborator Author

olivroy commented Aug 24, 2023

Woo, thanks for the tip! I will continue improving.

@olivroy olivroy marked this pull request as draft August 24, 2023 21:32
@JanMarvin
Copy link
Owner

all the mac clients are somewhat expensive iirc (not that I don't value software, but gitg does most of what I want and is open source). But github has a desktop client too., but this was confusing to me. The git client in Rstudio is somewhat limited, the one in Visual Studio code is okayish, but I don't really have experience with it.

@olivroy
Copy link
Collaborator Author

olivroy commented Aug 24, 2023

I use these. They are so helpful https://usethis.r-lib.org/articles/pr-functions.html and they never make mistakes. Unfortunately, they are a bit slow.

along with gert too.

@JanMarvin
Copy link
Owner

Ah I like to use git via command line, even though R is great, I don't want to use it for everything. But yeah, Jeroen is doing many cool things!

@olivroy olivroy deleted the topics branch August 31, 2023 12:37
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.

None yet

2 participants