What do you want to save?
Add Code snippet
New code examples
-
Shell/Bash 2022-01-31 04:05:27
git rebase conflict
Resolving merge conflicts after a Git rebase When you perform a git rebase operation, you're typically moving commits around. Because of this, you might get into a situation where a merge conflict is introduced. That means that two of your commits modifi... Add solution -
Shell/Bash 2021-11-22 02:34:12
git push rebase
git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]] git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>] --root [<... Add solution -
Shell/Bash 2021-11-21 02:44:14
undo git stash with conflicts
git reset HEAD . (note the trailing dot) git stash (save the conflicted merge, just in case) git checkout develop git fetch upstream; git merge upstream/develop git checkout <new-branch>; git rebase develop git stash apply stash@{1} Add solution -
Other 2021-11-16 11:09:34
how to remove a commit from origin branch
1 $git rebase -i HEAD~2 Add solution -
TypeScript 2021-11-12 19:21:11
squash commits on branch
$ git rebase -i HEAD~4 At the interactive screen that opens up, replace pick with squash at the top for all the commits that you want to squash. Save and close the editor through esc --> :wq $ git push origin branch-name --force Add solution -
TypeScript 2021-11-02 19:17:13
squash commits in remote branch
$ git rebase -i HEAD~4 At the interactive screen that opens up, replace pick with squash at the top for all the commits that you want to squash. Save and close the editor through esc --> :wq $ git push origin branch-name --force Add solution -
Shell/Bash 2021-10-25 12:59:07
git gss
# ---------------------- # Git Aliases # ---------------------- alias ga='git add' alias gaa='git add .' alias gaaa='git add --all' alias gau='git add --update' alias gb='git branch' alias gbd='git branch --delete ' alias gc='git commit' alias gcm='git co... Add solution -
Best helpers
Ranking is empty