Summary The error message Cannot ‘squash’ without a previous commit means you likely attempted to “squash downward.” Git always squashes a newer commit into an older commit or “upward” as viewed on the interactive rebase todo list, that is into a commit on a previous line. Changing the command on your todo list’s very first … Read more
Running git pull performs the following tasks, in order: git fetch git merge The merge step combines branches that have been setup to be merged in your config. You want to undo the merge step, but probably not the fetch (doesn’t make a lot of sense and shouldn’t be necessary). To undo the merge, use … Read more
How do we merge the master branch into the feature branch? Easy: git checkout feature1 git merge master There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now. Have a look at GitFlow. … Read more
Say your bug fix branch is called bugfix and you want to merge it into master: git checkout master git merge –squash bugfix git commit This will take all the commits from the bugfix branch, squash them into 1 commit, and merge it with your master branch. Explanation: git checkout master Switches to your master … Read more
I had the exact same problem as mentioned by you above. But I found this clearer in explaining the answer. Summary: Check out the path(s) from the branch you want to merge, $ git checkout source_branch — <paths>… Hint: It also works without `–` like seen in the linked post. or to selectively merge hunks … Read more
git pull -s recursive -X theirs <remoterepo or other repo> Or, simply, for the default repository: git pull -X theirs If you’re already in conflicted state… git checkout –theirs path/to/file
Short Version Merge takes all the changes in one branch and merges them into another branch in one commit. Rebase says I want the point at which I branched to move to a new starting point So when do you use either one? Merge Let’s say you have created a branch for the purpose of … Read more
How I would do this git checkout master git pull origin master git merge test git push origin master If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what … Read more
Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch: git reset –hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the “theirs” merge strategy: git pull –strategy=theirs remote_branch But this has since been … Read more