Eliminare denoting
Description
Description
Details
Details
- Provenance
olf Authored on Apr 16 2023, 2:59 AM • werner Committed on Apr 17 2023, 8:21 AM - Parents
- rD6d0e1bb0b09f: swdb: Libgcrypt 1.10.2
- Branches
- Unknown
- Tags
Event Timeline
Comment Actions
I wonder why github did not automatically closed this pull request - after all exact that patch was commited.
Comment Actions
True, also because this works well when resolving a merge-conflict locally.
For example:
- Create a PR in the GH-webfrontend from feature branch ´xyz´ to ´master´.
- Realise that merge-conflict exists, which GH does not want to resolve in the GH-webfrontend.
- Do ´git clone …´, ´cd …´, ´git pull xyz´, Resolve the conflict, ´git add´, ´git merge´ (so everything in the PR is merged from ´xyz´ to ´master´), ´git push´.
- GitHub automatically marks the merge conflict as resolved, closes the PR and offers to delete the merged fature-branch.
I do not comprehend yet, what is significantly different here, when the commit from the original PR at GH reached GH again via mirroring in master´. I will try to take a closer look the next time.
Comment Actions
The commit hashes are different:
- Here: 81a281183ff949fc88ef187118bbf3e89f4466ac (81a281183ff9)
- At GH: 35b9de6461762ff4849ebd7aa277f453b7f42be9 (35b9de6)