Questions tagged [squash]
Term used in version control systems that means combining several commits into one. Most often seen with git.
squash
293
questions
1
vote
1
answer
109
views
Pull request with Squash Commit in Azure DevOps
I'm experiencing an issue with squash commits in Azure DevOps pull requests. Occasionally, when I complete a pull request using the squash commit option, not all changes/changed files seem to be ...
- 13
0
votes
0
answers
32
views
Can't add plugins to Squash Docker
I use Squash with his docker image (squashtest/squash). I want to add plugins so I add the start-plugins.cfg with the name of plugins in. When I start the docker he crash after told me :
2024-05-17 16:...
0
votes
1
answer
30
views
Rewrite git history to transform merge commits in squashed self-contained commits
I've been trying to linearize my git history to remove merge commits and replace them by commits as if one used git merge --squash when creating them.
I have tried:
git checkout main
git log --reverse ...
- 191
0
votes
1
answer
45
views
How to rebase a child branch after its parent has been squashed, and can even disappear (for the child joining its parent-1)?
Here's was the development life:
I've started from a master branch, and created a feature branch.
feature = commits {a, b, c}
At a time, we were waiting for some specifications.
We decided to ...
- 3,129
0
votes
1
answer
56
views
How can I rebase a dependent branch on a squashed commit avoiding conflicts?
I have 3 branches
feature A (not managed by me)
feature B (managed by me)
branch main
My B branch is dependant from the branch A and A is already squashed in the main branch.
This graph shows the ...
- 899
1
vote
2
answers
103
views
Squashing commits on Gitlab BEFORE merge
I got couple commits on Gitlab inside my branch and want to squash them in one BEFORE merge(!important). When I try git rebase -i the terminal responds with error: nothing to do. How can I make it ...
- 55
0
votes
1
answer
59
views
Squashing commit history on a PR branch and retaining discussion information
I have a PR for an open-source repository on GitHub. I want to rebase the master branch onto my branch to keep it passing the action checks, and I was also suggested to squash all of the changes I've ...
- 1
0
votes
0
answers
15
views
Command to squash currently staged changes into last commit without interactive rebase [duplicate]
say I have a commit "Added API endpoint", and I forgot to add documentation to that endpoint.
I add that documentation, and I want those changes to be within that "Added API endpoint&...
- 1
0
votes
0
answers
35
views
git rebase squash finds merge conflicts despite fast forward
I have a feature branch with many trial-and-error commits and I want to combine all my changes into a single commit before merging to develop. I'm using git rebase -i to do this but getting ...
- 19.1k
1
vote
2
answers
105
views
Git rebase conflicts optimisation
Lets say I have created a branch F1 from main. This F1 branch has 20 commits in it. I now want to rebase this branch onto main to pick up changes from main
git checkout F1
git rebase -i main
However, ...
- 79
0
votes
0
answers
27
views
Can squashing a merge commit cause issues when merging to main branch?
Created a feature branch from develop.
Added few commits and pushed to remote.
Merged develop branch into my feature branch to get latest changes and pushed to remote.
Added few more commits and ...
- 6,270
0
votes
1
answer
152
views
Files added to .gitignore lost after attempting to squash a series of commits through interactive rebasing
I've been adding some files to .gitignore over a few commits, that I do not want pushed to remote. This includes files such as .Rprofile, which may contain information I do not want shared, and *.code-...
- 875
1
vote
1
answer
736
views
Stacked branches and PRs have conflicts due to squashed merges [duplicate]
I use stacked branches as I develop main <- feature1 <- feature2 ..., as well as stacked PRs with feature2 PR'd against feature1 and so on. My company uses squash merge when going into main i.e. ...
- 9,089
0
votes
0
answers
21
views
How to squag (I.E clean) the commit history in the midst of merge?
I'm trying to clean my commit history.
Now for some reason, there are merges to my main branch in my commit history, which is weird, because there was only ever one branch.
Anyway, Github for Windows ...
0
votes
1
answer
364
views
Squashed PRs are causing major conflicts in my stacked branches
As I work I create a branch (branch1) then I create a PR (pr1), then I keep working on the feature which is based on the code in that branch1. I create a branch (branch2) off of my branch (branch1). ...
- 9,089