Linked Questions

Git can be cryptic sometimes and the documentation out there even more so. My team and I are faced with a very particular situation. For reference, we have a production ready master branch and a ...

I have merged a feature branch into develop. After that I have found a bug in the feature branch code so I have reverted the merge (branch develop) : git revert -m 1 <merge-commit-hash> git ...

Let's say I merge a feature branch feature/123 into master, then a problem occurs and we have to remove it. So far I know about two ways to do this: git revert --mainline 1 <commitid> &&...

I have a branch A that was previously merged into dev and later reverted due to some issues. After a long time, I want to merge again that branch A on dev, but it's not updating the dev branch now. ...

I have a question concerning git, which probably has been solved already, but I am not able to find the right keywords. I have two branches master and feature. I merged feature in master to see if ...

Normal merge: $ git merge feature01 $ git merge feature02 Everything works fine. squash merge: $ git merge --squash feature01 # OK $ git merge --squash feature02 Auto-merging src/aaa.js CONFLICT (...

Scenario: You work in a CI/CD corporate environment where changes by several different teams get merged into master all the time. Sometimes, one of the merges has to be reverted, so that the release ...

I accidentally merged a few commits into the wrong branch (development) I reverted this via a revert PR, and then merged into the correct branch (Sprint-7) The team then merged Sprint-7 -> ...

I've merged a project from my abc branch to my xyz branch. I'm used to add the flags no-commit --no-ff in order to view all changes and approve them before commiting and pushing. So I received like 6 ...

First, I have studied this answer but it doesn't quite match my situation. We currently have this: ---o---o---C---M---W <-- develop / ---A---B <-- new_feature When I ...

The scenario is as below: Assume that the state of master and develop branches are A, feature/issue-1 branch is B. feature/issue-1 branch is created from master branch. Merge the code of branch ...