All Questions
Tagged with git-squash git-merge-conflict
3
questions
1
vote
3
answers
268
views
How to correct bug in merge - squash fix commit to merge commit
this should be probably very easy, but I am not able to solve it out. I introduced bug in the merge, and than I corrected it in additional commit. I would like to squash the "bug fix" commit ...
- 818
8
votes
1
answer
1k
views
Branching from a feature branch and reconciling commits after main squash merge
I have the following situation: I've worked on a feature branch (called work1) to which I have an outstanding PR. While I wait for the PR to be approved, I want to start working on a new feature ...
- 1,703
7
votes
1
answer
1k
views
Avoiding conflicts in git when merging a squashed commit from main into feature branch
Consider the following practice:
A developer branches from main and creates as many commits as needed in a feature branch
Once the feature is completed, all commits are squashed and merged into the ...
- 1,359