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 -
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-14 00:51:07
how to move master changes to branch
git checkout -b newfeat master git rebase --onto working-branch origin/master newfeat git checkout master git reset --hard origin/master At this point you have: *master pointing to the last pushed commit (origin/master) *working-branch never changed *a n... Add solution -
Best helpers
Ranking is empty