-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge recent commits from sailfishos-applications/filecase:devel
#2
Merge recent commits from sailfishos-applications/filecase:devel
#2
Conversation
… (#55) [Contributed](#54 (comment)) by @nephros
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
P.S.: Please let us discuss the specifics of your changes in the PR you pose to sailfishos-applications/filecase:rectify-webdav
after merging this one.
I cant create a PR, |
Oh, this is not how it ought to be: Everybody should be allowed to pose PRs. Thank you for trying and notifying me. I will have a look a little later. |
Where do you see this message? I.e., are you trying to pose the PR in VScode / VSstudio or the GitHub-app? If so, please try at GitHub's web-frontend; this should be the correct link to start with. |
Arrgh, often I love Git, sometimes I still hate it: Your resulting PR should look like this.
|
Please merge this PR (i.e. by performing a regular "merge commit", not a "squash commit"), then create a PR of
Logic-gate/filecase:devel
tosailfishos-applications/filecase:rectify-webdav
.Thanks!
P.S.: Please note that the usual convention is to open a new "topic branch" when suggesting changes, then pose a PR from this topic branch to the default branch at origin; GitHub suggests
<username>-patch-N
(with N = 1, 2, 3, …; depending on how many PRs one poses in parallel) when doing this via the GitHub web-frontend: This way the default branch (here:devel
) in your git repo keeps reflecting the default branch in the origin(al) repo at the time of cloning it. When there were additional commits to the default branch at origin (happened here) this is much easier to resolve if your changes are in a separate feature branch.But there is nothing which cannot be addressed by another ("level of" in the original phrase) indirection: Hence I created the
rectify-webdav
feature branch at origin to proceed. Please pose a PR with your changes (i.e. fromLogic-gate/filecase:devel
) to it, after having merged this PR.