Skip to main content
5 events
when toggle format what by license comment
Mar 30 at 22:18 history edited Benjamin Loison CC BY-SA 4.0
Add shell syntax highlighting
Jun 29, 2021 at 21:12 comment added Csaba Toth Also, GitHub's PR (the UI Fetch button creates the PR against the fork repo) is a shitshow if there's a conflict. I'd rather just go with these manual steps.
Jun 29, 2021 at 21:11 comment added Csaba Toth If there's a conflict then one'd only need to resolve those after the merge command and mark the resolves by git add command for the conflicted files. Also, if the repo in question is a forked one someone has to first define the upstream: git remote add upstream https://...git where the git is for the repo which got forked.
Jun 10, 2020 at 12:56 review Low quality answers
Jun 11, 2020 at 7:10
Feb 9, 2020 at 2:20 history answered Vy Do CC BY-SA 4.0