[PR #439] [CLOSED] GitHub stroking out on my end. :) #3623

New issue

Closed

opened 2026-05-05 10:04:51 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:04:51 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/439
Author: @Fred-Barclay
Created: 4/16/2016
Status: ❌ Closed

Base: master ← Head: master

📝 Commits (5)

1e27f77 added new 0ad profile
978ca65 oops! missed a few.
40f13c9 fixed Makefile.in
a7a48d9 removed comment & extra lines at end
152732c Fixed merged conflicts

📄 Description

Hi netblue30. I hate to ask, but could you merge this? Apparently there were multiple file conflicts between your repo and my fork ("unmerged paths" to be specific). I've discarded my changes and kept yours when merging, so merging will change nothing on your end and make my fork happy. :)

(Or if this is related to my abysmal understanding of git and I should be taking another step entirely, please let me know.)
Thanks!

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/439 **Author:** [@Fred-Barclay](https://github.com/Fred-Barclay) **Created:** 4/16/2016 **Status:** ❌ Closed **Base:** `master` ← **Head:** `master` --- ### 📝 Commits (5) - [`1e27f77`](https://github.com/netblue30/firejail/commit/1e27f777300ce7bf8c59cbb7e276ce877a55670c) added new 0ad profile - [`978ca65`](https://github.com/netblue30/firejail/commit/978ca650949405310284397e60e4ec769499573c) oops! missed a few. - [`40f13c9`](https://github.com/netblue30/firejail/commit/40f13c96ad1fde20bd445a7dc92beea1e2e801f5) fixed Makefile.in - [`a7a48d9`](https://github.com/netblue30/firejail/commit/a7a48d901acf42fcd3dd1b690f32342814b59ffd) removed comment & extra lines at end - [`152732c`](https://github.com/netblue30/firejail/commit/152732c8593d1c6057c94a821031d76947725758) Fixed merged conflicts ### 📄 Description Hi netblue30. I hate to ask, but could you merge this? Apparently there were multiple file conflicts between your repo and my fork ("unmerged paths" to be specific). I've discarded my changes and kept yours when merging, so merging will change nothing on your end and make my fork happy. :) (Or if this is related to my abysmal understanding of git and I should be taking another step entirely, please let me know.) Thanks! --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:04:51 -06:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#3623

No description provided.

Rows
Columns