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

Bugfix concat path #163

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Bugfix concat path #163

merged 2 commits into from
Jan 16, 2025

Conversation

trondth
Copy link
Contributor

@trondth trondth commented Jan 15, 2025

No description provided.

Copy link

Triggered from #163 by @​trondth.

Checking if we can fast forward master (a6bda19) to bugfix_concat_path (7b92ca7).

Target branch (master):

commit a6bda19c5d0a28fbe939a88890674f9a9fcb6012 (HEAD -> master, origin/master, origin/HEAD)
Author: Trond Thorbjørnsen <trond.thorbjornsen@usit.uio.no>
Date:   Wed Jan 15 11:00:52 2025 +0100

    use pathlib for concatenating paths

Pull request (bugfix_concat_path):

commit 7b92ca76d6d345648dd33026b491e130420fc165 (pull_request/bugfix_concat_path)
Author: Trond Thorbjørnsen <trond.thorbjornsen@usit.uio.no>
Date:   Wed Jan 15 15:51:25 2025 +0100

    fix concatenation for resumables

Can't fast forward master (a6bda19) to bugfix_concat_path (7b92ca7). master (a6bda19) is not a direct ancestor of bugfix_concat_path (7b92ca7). Branches appear to have diverged at 7395aaf:

* 7b92ca76d6d345648dd33026b491e130420fc165 fix concatenation for resumables
* 7545e9213dd3550c9cf4a5b0ce3a3a3a6a4fdaf6 use pathlib for concatenating paths
| * a6bda19c5d0a28fbe939a88890674f9a9fcb6012 use pathlib for concatenating paths
|/  
* 7395aaf8382e82d80127cf04d6f0352150c77c32 fix: Switch to using Optional to preserve compatibility with 3.9

commit 7395aaf8382e82d80127cf04d6f0352150c77c32 (tag: v3.6.3)
Author: Milen Kouylekov <milen.kouylekov@usit.uio.no>
Date:   Wed Nov 6 12:57:47 2024 +0100

    fix: Switch to using Optional to preserve compatibility with 3.9

Rebase locally, and then force push to bugfix_concat_path.

@trondth trondth merged commit 40aa685 into master Jan 16, 2025
2 of 3 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