Gitlab :: How to avoid duplicate pipelines
When one has defined a CI pipeline in Gitlab that runs on every push to your repository and one that runs for merge requests, one may end up with duplicate pipelines running waisting money and resources
git¶
Git: Squash commits
When merging your work into another branch, it may be useful to regroup all the commits into one and indicate a clear commit message that says what has been done.
Git: Find latest common ancestor of two branches
To find the latest common ancestor of two branches, which is required, for instance, when squashing your commits, instead of scrolling through you
git loghistory you can use thegit-merge-base1 tool.
Git: Rebase with dependent branches
Rebasing a branch on another is very common...
Yet by default, the dependent branches of the rebased branch will remain where they are and not follow the rebase.
This notes shows how to deal with those dependent branches.
Git: Update local branch after rebase
Quite often we have to use the
git rebaseto realign the branch we are working on with the latest version of its parent branch.
After the rebase, your coworkers need to update their version of the branch.
Git: Undo reset --hard
Sometimes one is distracted... and an accidental
git reset --hardhappens.
But within a few days after the accident, you can recover from the GIT reflog.