All Questions
Tagged with git-squash bitbucket
4
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
0
votes
1
answer
669
views
squash commits in git and remove "ugly" merge message
I am trying to squash 2 commits and remove merge part, but have some problems.
I have branch main and featureBranch.
In my terminal I do:
git checkout main
git merge --squash featureBranch
git push
...
- 841
1
vote
0
answers
107
views
Squash for already pushed commits
I am trying to squash 9 commits of my branch, and for this, I ran this command:
git rebase -i HEAD~9
After then, it showed editor on terminal. Then, I edited the first one as pick , and rest one ...
- 372
0
votes
1
answer
342
views
How do I fix this git commit log?
I have a repository on Bitbucket. I kinda screwed up the commit log when I tried to squash the commits c265825 and 0a1837e:
Trying to squash these commits resulted in 0942142, which is basically ...
- 15.7k