Skip to content

Ignore the output logs - #16

Merged
wkearn merged 1 commit into
TopoToolbox:mainfrom
wkearn:ignore-output
Jul 21, 2026
Merged

Ignore the output logs#16
wkearn merged 1 commit into
TopoToolbox:mainfrom
wkearn:ignore-output

Conversation

@wkearn

@wkearn wkearn commented Jul 15, 2026

Copy link
Copy Markdown
Member

These get generated by the tests, but we don't really want to save or check them, so it is best to ignore them.

These get generated by the tests, but we don't really want to save or
check them, so it is best to ignore them.

Signed-off-by: William Kearney <william.kearney@uni-potsdam.de>
@jkhillier

Copy link
Copy Markdown
Contributor

Hi Will - Branch "JH_refactor_3" is one commit ahead. So, I don't want to do further commits to complicate things. It has some changes to swt.c, but the two output files you don't want. What do you want me to do? Remove the output files and commit again? You've told me how to do this, but I'm just not sure if it will help (i.e. overwrite the last commit) or will mess things up. Please advise. Thank you. John

@wkearn

wkearn commented Jul 21, 2026

Copy link
Copy Markdown
Member Author

@jkhillier: You have done everything correctly so far. Your JH_refactor_3 branch is one commit ahead of main, and that one commit is the one (af5a31e) that you currently have in your pull request (#15). You should be able to git rm test/output.txt test/seamounts_output.txt then git commit to remove the output logs. This will add a commit to your branch and put you two commits ahead of main.

Then I will merge #15 first, followed by this pull request (#16), so you shouldn't have to do anything weird beyond removing the output files.

Once #16 is merged, you won't be able to commit the test/output.txt and test/seamounts_output.txt files, so this kind of thing should be less likely to happen in the future.

@jkhillier

Copy link
Copy Markdown
Contributor

Thank you William - The clarification on the nature of what 'commit' does was what I needed. Second commit done with output files removed. If I'm correct, I don't need to do another pull request .... but please let me know if I've got another action here. John

@wkearn
wkearn merged commit d359ecf into TopoToolbox:main Jul 21, 2026
2 checks passed
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