Term used in version control systems that means combining several commits into one. Most often seen with git.
Questions tagged [squash]
286 questions
0
votes
1 answer
git squash diverged from tracked branch
I'm trying to squash some commits from a branch I'm tracking from a github repository (and also in my internal gitolite server). My problem is that I'm rebasing as explained at…
0
votes
1 answer
How to merge two incontinuous commits
I want to merge e5c1e1d and 627c6c6
How to do it ? I want an easier way.
Because if there are hundreds commits between them, it will be very trouble to do rollback then re-commit.
* fc60bec - (HEAD, master) Make db migrate (67 seconds ago)
*…
newBike
- 14,385
- 29
- 109
- 192
0
votes
2 answers
Git --no-merged with --squash
I prefer to merge my feature branches with --squash as it lets me track when features were added, and it is usually complete features that I need to bisect on. I find that this gives a very nice representation of the state of the stable branch over…
dotancohen
- 30,064
- 36
- 138
- 197
0
votes
2 answers
git squash commits which has been merged locally?
I worked on branch_A and merged it to branch_B (both are local branches)
Is it a good practice to squash commits in branch_A.
What if I'm going to push branch_A to public repo and my master will fetch it in the future?
eugene
- 39,839
- 68
- 255
- 489
0
votes
1 answer
How to install plugin to eclipse from repository
I want to install plugin to eclipse from this repository:
http://repo.squashtest.org/maven2/releases/org/squashtest/ta/squash-ta-maven-plugin/
But I have no idea how to do this. When I click on help->install new software and add this url I don't…
caro2
- 155
- 1
- 4
- 13
0
votes
1 answer
Wrong hostname in squash TM on external server
I have a problem with reporting bug in squash TM. This is problem connected with my server name on which squash is installed. I have it on external server. In one place in application I got wrong URL like…
caro2
- 155
- 1
- 4
- 13
0
votes
0 answers
Reporting bug to mantis through Squash TM
I configured my bug tracker (mantis) in administration section. Now, I want to add a bug to this bugtracker through squashTM. But I got an error like this:
http://img854.imageshack.us/img854/2739/20130313092653.png
What should I do? When I was…
caro2
- 155
- 1
- 4
- 13
0
votes
2 answers
Squashing or rebasing while branching
I'm starting a new branch from my master branch. But I do not want the whole history on the new branch. I would like only 1 commit to start the branch.
I have created the new branch and tried to rebase all the commits but it does not work since I…
Franck
- 560
- 7
- 20
-1
votes
1 answer
Stacked branches and prs have conflicts due to squashed merges
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. in github ( actually gitlab ) when you merge your pr…
Raif
- 8,641
- 13
- 45
- 56
-1
votes
1 answer
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). Then I create a pr(pr2) based on pr1. Maybe…
Raif
- 8,641
- 13
- 45
- 56
-1
votes
1 answer
How to squash the last N commits into a single commit in git?
I actually want to squash around 5-6 commits in a single commit. What is the best option I have in this case?
Muhammad Mujtaba Shafique
- 299
- 2
- 12
-1
votes
2 answers
Squash commits to the first commit in a branch
I forked a repository, made a branch from master, made two commits to it, and sent a pull request. Now, I want to squash the commits in that branch to one so that it shows only one commit in the pull request.
Can someone explain with steps, how it…
Rohan Gupta
- 17
- 5
-1
votes
1 answer
Git rebase, squashing two commits and keep everting all as it is
Hello I have this type of situation
13f5337 100
c8fw28f 99
3554tb0 98
2321dsw 97
a551654 96
41c990d 95
1343756 94toxic data Fixed
96236fb 93toxic data
8894377 92
94t6ff1 91
dda323w 1
I am trying to squash commit 94 and 95 so toxic data is not…
Dzonaton
- 1
-1
votes
1 answer
Branch squash-merged to master, and merged back to branch
My git workflow consists in feature branches squash-merged to master after they have been validated. However, I am unaware of the consequences of these squashed commits being brought back to the same branch they came from, via merge master without…
lightlazer
- 133
- 1
- 5
-2
votes
1 answer
git - How can I squash all commits till branch starts?
I want to Squash all commit in the branch, while preserve their commit messages into the squashed commit. For example here, I want to squash [8015a49, 38a7b5a, 4c7e9e2, 49a7b5a] commits into one but keeping till 70d79f9 unchanged.
* 8015a49 -…
alper
- 2,919
- 9
- 53
- 102