This question is similar to this one, but more specific. I have a project with two branches: staging and beta. I develop on staging, and use the master branch to fix bugs. So if I’m working on staging and I see an error, I change to master branch: git checkout master and do the stuff: … Read more
We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts … Read more
I’m merging in a remote branch that may have a lot of conflicts. How can I tell if it will have conflicts or not? I don’t see anything like a –dry-run on git-merge. 20 Answers 20
I’ve got a problem, where a large commit which changes about a thousand lines of code, removing whitespace from the end of lines and removing spaces before tabs. There are also about 50 pull requests for this project, in which all will get conflicts, when my commit is merged. Is there any way that git … Read more
I’m trying to find the syntax for merging a tagged commit onto another branch. I’m guessing that it’s straight forward but my feeble search attempts aren’t finding it. 5 Answers 5
I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. Now I ran git mergetool and vimdiff opened with the image below. I don’t know how to use vimdiff. What does each panel here mean and how should I proceed to fix … Read more
I am working on a Git branch that has some broken tests, and I would like to pull (merge changes, not just overwrite) these tests from another branch where they are already fixed. I know I can do git pull origin that_other_branch but this will attempt to merge lots of other files, for that I … Read more
Let’s imagine that we have a master branch. Then we create a newbranch git checkout -b newbranch and make two new commits to newbranch: commit1 and commit2 Then we switch to master and make cherry-pick git checkout master git cherry-pick hash_of_commit1 Looking into gitk we see that commit1 and its cherry-picked version have different hashes, … Read more
I am working on a project using Git as the VCS. I got a branch xyz cut from the mainline branch of master. After working for a while, I committed my code and took a pull of the branch mainline. The pull was fine. I then merged the code with master. After the merge, there … Read more
I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge my stashed changes with the current changes. Is there a way to do this? Its more for convenience, I eventually gave up and committed first my … Read more
