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

Merge recent commits from sailfishos-applications/filecase:devel #2

Merged
merged 10 commits into from
Nov 25, 2023

Conversation

Olf0
Copy link

@Olf0 Olf0 commented Nov 25, 2023

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 to sailfishos-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. from Logic-gate/filecase:devel) to it, after having merged this PR.

@Olf0 Olf0 marked this pull request as ready for review November 25, 2023 02:02
Copy link
Author

@Olf0 Olf0 left a 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.

@Logic-gate
Copy link
Owner

I cant create a PR, Pull request creation failed. Validation failed: must be a collaborator

@Olf0
Copy link
Author

Olf0 commented Nov 25, 2023

I cant create a PR, Pull request creation failed. Validation failed: must be a collaborator

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.

@Olf0
Copy link
Author

Olf0 commented Nov 25, 2023

I cant create a PR, Pull request creation failed. Validation failed: must be a collaborator

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.

@Olf0
Copy link
Author

Olf0 commented Nov 25, 2023

Arrgh, often I love Git, sometimes I still hate it: Your resulting PR should look like this.

  1. Do you manage to pose a similar PR?

  2. But as you see, because commits are diffs at a certain point in time, there is "nothing to commit"; there sure is, it is still in your devel branch, but those commits are temporally before the merge commit from sailfishos-applications:filecase:rectify-webdav. One way to handle that would be:

    1. I revert this merge here.
    2. You rebase your devel on sailfishos-applications:filcase:devel. If you do not want to do that at the git command line, I can instruct you how to achieve this at GitHub's web-frontend, it is just a few clicks:
      1. Open a PR: sailfishos-applications/filecase@devel...Logic-gate:filecase:devel
      2. Hit the rebase button.

    Better way, how it should have been in the first place:

    1. Branch your devel branch to a feature branch, e.g. fix-webdav.
    2. Create a PR from that feature branch to origin:devel.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants