Skip to content

Instantly share code, notes, and snippets.

@meyerweb
Last active March 11, 2021 20:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save meyerweb/0e56393d48231ce455f96ce930deabcc to your computer and use it in GitHub Desktop.
Save meyerweb/0e56393d48231ce455f96ce930deabcc to your computer and use it in GitHub Desktop.
[detached HEAD 29d63f4] Resolved conflicts
2 files changed, 7 insertions(+), 7 deletions(-)
~/sites/igalia/wpewebkit.org ((no branch, rebasing issue-61))> git push
fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD)
state now, use
git push origin HEAD:<name-of-remote-branch>
~/sites/igalia/wpewebkit.org ((no branch, rebasing issue-61))> git rebase --continue
Applying: Added working links, changed markup to go straight text
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
~/sites/igalia/wpewebkit.org ((no branch, rebasing issue-61))> git status
rebase in progress; onto 8e40a74
You are currently rebasing branch 'issue-61' on '8e40a74'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
~/sites/igalia/wpewebkit.org ((no branch, rebasing issue-61))> git rebase --continue
Applying: Added working links, changed markup to go straight text
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
~/sites/igalia/wpewebkit.org ((no branch, rebasing issue-61))> git rebase --abort
~/sites/igalia/wpewebkit.org (issue-61)> git status
On branch issue-61
Your branch is behind 'origin/issue-61' by 12 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
~/sites/igalia/wpewebkit.org (issue-61)> git push
To github.com:igalia/wpewebkit.org.git
! [rejected] issue-61 -> issue-61 (non-fast-forward)
error: failed to push some refs to 'git@github.com:igalia/wpewebkit.org.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
~/sites/igalia/wpewebkit.org (issue-61)> git pull
Updating 51cd547..b99436a
Fast-forward
.eleventy.js | 134 +-
_posts/2018-05-09-wpe-2.21.1-released.md | 1 +
_posts/2018-05-14-wpe-2.19.93-released.md | 1 +
_posts/2018-05-18-wpe-2.10.0-released.md | 1 +
_posts/2018-05-25-wpe-2.21.2-released.md | 1 +
...pe-2.20.1-releeased.md => 2018-06-14-wpe-2.20.1-released.md} | 1 +
_posts/2018-07-09-wpebackend-0.2.0-released.md | 1 +
_posts/2018-08-06-wpe-2.20.2-released.md | 1 +
_posts/2018-08-21-libwpe-1.0.0-released.md | 1 +
_posts/2018-08-21-wpe-2.21.91-released.md | 1 +
_posts/2018-08-21-wpebackend-fdo-1.0.0-released.md | 1 +
_posts/2018-09-07-wpe-2.21.92-released.md | 1 +
_posts/2018-10-02-wpe-2.22.0-released.md | 1 +
_posts/2018-11-06-wpewebkit-2.22.1-released.md | 1 +
_posts/2018-11-21-wpewebkit-2.22.2-released.md | 1 +
_posts/2018-12-13-libwpe-1.1.0-released.md | 1 +
_posts/2018-12-13-wpewebkit-2.22.3-released.md | 1 +
_posts/2018-12-14-wpebackend-fdo-1.1.0-released.md | 1 +
_posts/2019-01-06-wpebackend-fdo-1.0.1-released.md | 1 +
_posts/2019-02-09-wpewebkit-2.22.4-released.md | 1 +
_posts/2019-02-21-wpewebkit-2.23.90-released.md | 1 +
_posts/2019-02-26-wpebackend-fdo-1.1.90.md | 1 +
_posts/2019-03-01-wpewebkit-2.22.5-released.md | 1 +
_posts/2019-03-04-libwpe-1.1.90-released.md | 1 +
_posts/2019-03-14-wpebackend-fdo-1.1.91.md | 1 +
_posts/2019-03-18-wpewebkit-2.23.91.md | 1 +
_posts/2019-03-26-libwpe-1.2.0-released.md | 1 +
_posts/2019-03-26-wpebackend-fdo-1.2.0.md | 1 +
_posts/2019-03-27-wpewebkit-2.24.0.md | 1 +
_posts/2019-04-19-wpewebkit-2.24.1.md | 1 +
_posts/2019-05-08-libwpe-1.3.0-released.md | 1 +
_posts/2019-05-08-wpebackend-fdo-1.3.0-released.md | 1 +
_posts/2019-05-20-wpewebkit-2.24.2.md | 1 +
_posts/2019-06-13-wpebackend-fdo-1.3.1-released.md | 1 +
_posts/2019-06-17-libwpe-1.3.1-released.md | 1 +
_posts/2019-06-19-wpewebkit-2.25.1-released.md | 1 +
_posts/2019-07-01-wpebackend-fdo-1.2.1-released.md | 1 +
_posts/2019-08-12-libwpe-1.2.1-released.md | 1 +
_posts/2019-08-12-wpebackend-fdo-1.2.2-released.md | 1 +
_posts/2019-08-13-wpewebkit-2.25.2-released.md | 1 +
_posts/2019-08-28-wpewebkit-2.24.3-released.md | 1 +
_posts/2019-09-09-libwpe-1.3.91-released.md | 1 +
_posts/2019-09-09-wpebackend-fdo-1.3.91-released.md | 1 +
_posts/2019-09-09-wpewebkit-2.25.91-released.md | 1 +
about/faq.md | 118 +-
index.html | 104 +-
package-lock.json | 4151 ++++++++++++++++++++++++++-
release.md | 142 +-
48 files changed, 4536 insertions(+), 156 deletions(-)
rename _posts/{2018-06-14-wpe-2.20.1-releeased.md => 2018-06-14-wpe-2.20.1-released.md} (98%)
~/sites/igalia/wpewebkit.org (issue-61)> git status
On branch issue-61
Your branch is up to date with 'origin/issue-61'.
nothing to commit, working tree clean
~/sites/igalia/wpewebkit.org (issue-61)> git push
Everything up-to-date
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment