gitgit-mergegit-squash
Is it safe to squash commits that include a merge commit
Can I safely squash commits where one of them is a merge commit? My commit history looks like this:
I'm wondering if there will be problems or conflicts when trying to merge this squashed branch into master. I haven't pushed my branch yet so it shouldn't affect other people's git history.
Solution
I'm wondering if there will be problems or conflicts when trying to merge this squashed branch into master.
That question is impossible to answer from here. There will or there won't. But whether there will be "problems or conflicts when trying to merge this branch into master" has nothing to do with whether the branch is squashed or not. It depends on what's been going on in master while you were out, as it were.
- Switched branch without commiting changes, what do I do now?
- How do I add a private Git repository as a submodule inside a public Git repository?
- git diff showing only commits that revision/branch A is ahead of revision/branch B
- How to install git on a docker ubuntu image?
- What happens to a git submodule when its referenced repo is deleted?
- How do I create a "True merge" from the current HEAD into a previous commit reachable from HEAD?
- Can I run Git commands in Visual Studio?
- git commit and push even although no changes have been made, it's necessary to trigger web hook
- How can I rename a local Git branch?
- How to undo git init on a home directory?
- Remove a file from a Git Pull Request
- RPC failed; HTTP 400 curl 22 The requested URL returned error: 400 Bad Request
- Git Bash and Pageant are not using keys
- How To Stop Git-Bash command on windows
- How to ignore new changes to a tracked file with git?
- git fatal: protocol error: bad line length 173
- Why can't I checkout a remote branch from git?
- gpg failed to sign the data fatal: failed to write commit object [Git 2.10.0]
- FetchContent access to private Git repository
- Merging existing git repository with new one
- Git - how to remove branch from checkout autocomplete
- Remote anonymous access to repository denied?
- SourceTree - how to checkout to remote repo branch
- What is the HEAD in git?
- How to change past commit to include a missed file after other commits have been made?
- How inject git revision into Nix derivation?
- GitHub: How to do case sensitive search for the code in repository?
- How do I show statistics for author's contributions in git?
- "could not find a compatible repository" error on gitkraken repo
- Start ssh-agent on login