All Questions
Tagged with git-squash github
44
questions
0
votes
0
answers
19
views
Git Showing Same Line Removed and Added after Merging Master into Feature Branch [duplicate]
After I merged from master, there were a few conflicts which I resolved, I am seeing various files having the same line deleted and added back in. I am not sure where this is coming from or how to ...
- 31
-1
votes
2
answers
89
views
How to convert GitHub squash and merge commits to merge commits?
I have a personal project GitHub repository that used the squash and merge option for pull requests.
How do I rewrite the Git history so that the pull requests used the merge commit option instead of ...
0
votes
1
answer
91
views
git thinks branch missing commits merged earlier
My team has recently transitioned to a GitHub Actions CI/CD workflow and we are encountering an issue that I'm uncertain how best to resolve.
First, I'll describe our current branching strategy:
We ...
- 997
0
votes
2
answers
137
views
best git practice to avoid squash
I have been using squash with the steps below and I find it really time consuming and error prone
git rebase upstream/develop
git merge-base mylocaldev upstream/develop (this will display a commit ...
- 389
0
votes
1
answer
166
views
Git squash N-consecutive commits in the middle of the branch history
Let's say I have several consecutive commits, we name them A0..A99 for simplicity, pushed by the same author to the main branch: these commits are not the last commits pushed to the main branch as ...
- 2,380
2
votes
1
answer
685
views
Cannot squash merge in GitHub Desktop
When trying to squash merge 3 commits in GitHub Desktop, I was warned with the following error message:
Unable to squash. Squashing replays all commits up to the last one required for the squash. A ...
- 31
0
votes
1
answer
307
views
Squashing commits gone wrong [duplicate]
Say I have pushed two commits and I and try to squash them.
Instead of doing git rebase -i HEAD~2 - I accidentally do git rebase -i HEAD~3
Here the 3rd last commit is from someone else but it would ...
- 1,940
1
vote
0
answers
765
views
Validate commit message contains Jira Ticket Number when squash merge from GitHub webUI
When doing a squash merge, following a successful Pull Request, on github I would like to validate that the squash merge commit message contains a Jira ticket number. If it does not the squash merge ...
- 11
1
vote
1
answer
2k
views
Squash merging in git keeps including previously-merged branches
I'm using Github, with branches for development, live and various feature & bug branches.
When I merge a feature or bugfix into development, I typically do a squash merge (usually through the GH ...
- 28.6k
0
votes
1
answer
1k
views
GitHub Pull Request: Squash before merge without fast-forward
GitHub offers three options to merge PRs:
Merge pull request: No fast-forward merge.
Squash and merge: Squash commits and perform fast-forward merge.
Rebase and merge: Rebases all commits onto the ...
- 788
2
votes
2
answers
2k
views
Git interactive rebase did not delete my other commits
I have some commits in my current branch. I want to convert those all commits into one commit and delete all those commits. So I have used the following commands
git rebase -i HEAD~9
Edited all ...
- 798
7
votes
1
answer
3k
views
Still compare committed difference after squash merging
I have merged a develop branch into main branch using squash merge. Let's say there are commit A, B, C merged into main from develop. The changes are successfully merged. I can see the squash commit ...
- 497
0
votes
0
answers
315
views
Change default Squash And Merge commit message algorithm
I want to write CI/CD script, which will change the default generated Squash And Merge commit into the convention my team uses. Is it possible to change it in CI/CD level, can I get commit messages in ...
0
votes
0
answers
283
views
Merge commit from main branch to release
I have two main separate branch Master and release. My two PR(pull request) merged to Master branch called. featureA and featureB and deleted. Also many other feature branch merged to Master by ...
- 19.3k
0
votes
1
answer
119
views
Squash a merge commit with the first commit on a branch
I have a commit and a merge commit after it. I want to squash the merge commit with the first commit on the same branch. Can someone explain how this can be done?
Screenshot of git rebase -i -r
- 17