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

Make maintaining a fork easier #105

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Conversation

Kylogias
Copy link
Contributor

This pull request makes maintaining a fork generally easier. This includes

  • adding 4 generated files to the .gitignore
  • add some files to make clean that got missed before
  • Remove the line for the git hash in rawdraw_sf.h (making it easier to keep a fork up-to-date by getting rid of merge conflicts from that line)

@cnlohr
Copy link
Member

cnlohr commented Apr 22, 2024

What mechanism can we use to identify the source of the rawdraw_sf.h? Is there some way we could do it where if it was generated from the official folder it would retain that information verses if it was from a local branch? Maybe make it so local branch outputs go to a different folder than the official one?

I.e. make a new folder, call it local/

Then, when anyone other than the github ci builds it, it builds rawdraw_sf.h and puts it into local/?

@Kylogias
Copy link
Contributor Author

I couldn't figure out a way to keep the problematic line in rawdraw_sf.h and to not have it create conflicts, so I amended the commit to revert the removal of the line

@cnlohr cnlohr merged commit 72c588c into cntools:master Apr 29, 2024
1 check passed
@Kylogias Kylogias deleted the meta-changes branch May 8, 2024 00:41
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