The easiest thing to do would be to diff the results of your conflict resolution with a merge that auto-resolves conflicts without human intervention. Any automatic resolutions will be ignored, since they will be resolved in exactly the same way. I see two ways of visualizing the possible “evil” resolutions. If you are making this … Read more
To integrate one branch into another, you have to either merge or rebase. Since it’s only safe to rebase commits that aren’t referenced anywhere else (not merged to other local branches; not pushed to any remote), it’s generally better to merge. If your feature branch is purely local, you can rebase it on top of … Read more
The issue seems to be that git stash doesn’t save a reference to the branch you were trying to merge in. During a merge, this is stored in a ref named MERGE_HEAD. To fix it and get back to your previous state, you need to find the revision (let’s pretend it’s d7a9884a380f81b2fbf002442ee9c9eaf34ff68d) you were trying … Read more
cmaster’s answer is correct, with caveats. Let’s start by noting these items / assumptions: There is always a single merge base commit. Let’s call this commit B, for base. The other two inputs are also single commits. Let’s call them L for left / local (–ours) and R for right / remote (–theirs). The first … Read more
Git has –auto hard coded as a command-line option to KDiff3, which causes the GUI not to show up if all conflicts are auto-resolvable by KDiff3. In the KDiff3 settings you can specify command line options to ignore, but putting –auto there did not work for me. As a workaround I configured my own variant … Read more
tl;dr Even if you can include merge commits in a rebase, you can’t squash merge commits. Git will let you know by saying: Refusing to squash a merge: <SHA-1> What you can do in order to keep the changes made during the merge is to convert the merge commit into a normal commit. At that … Read more
You might be best off looking for a description of a 3-way merge algorithm. A high-level description would go something like this: Find a suitable merge base B – a version of the file that is an ancestor of both of the new versions (X and Y), and usually the most recent such base (although … Read more
Git is warning you that forms/answers.php has changes in your working copy or index that have not been committed. You can use git-stash to save your changes then git-stash apply to restore them. The common use case of git-stash is that you are working on changes but then must temporarily checkout a different branch to … Read more
It’s quite simple: f6ff240dbf47234249a68b34c8a98bb11237aa7 doesn’t exist. I just realize you mean 3f6ff240dbf47234249a68b34c8a98bb11237aa7 (Note the missing 3 at the beginning) Just go to the commit list and type Ctrl+f f6ff. If that is someone you know, you should tell them to always branch from master and commit their custom changes there (for every change), instead of … Read more
Yes that is correct, the pull request on GitHub and Bitbucket is a request to merge two branches. One of the use cases is to have a QA person who is not the developer review and approve the merge request. Another use case is development on master branch is not allowed. A developer always develop … Read more