I have to solve some conflict after a `git pull`.

    $ git pull
    CONFLICT (rename/add): Renamed vignette_generator_mashed.h-&gt;vision_problem_8.h in 49423dd0d47abe6d839a783b5517bdfd200a202f. vision_problem_8.h added in HEAD
    Added as vision_problem_8.h~HEAD_1 instead
    Removed vignette_generator_cross_square.cc
    Automatic merge failed; fix conflicts and then commit the result.

So I googled it a bit, and found people saying using `git mergetool`. But here is what I got:

    $ git mergetool
    merge tool candidates: meld kdiff3 tkdiff xxdiff meld gvimdiff emerge opendiff emerge vimdiff
    No files need merging
    $ git mergetool opendiff
    merge tool candidates: meld kdiff3 tkdiff xxdiff meld gvimdiff emerge opendiff emerge vimdiff
    opendiff: file not found

So does it mean I have to install something?

What if I simply want the version from `git pull` to overwrite everything?




How do I resolve a conflict after git pull?

When I merge a branch in Git to master I often get merge conflicts. Is there a way to merge a branch and just overwrite the stuff in the current branch?



Merging but overwriting changes in Git

What is the best way to resolve a conflict when doing a `git svn rebase`, and the git branch you are on becomes &quot;(no-branch)&quot;?


How to resolve a conflict with git-svn?

I&#39;m running into conflicts while trying to merge upstream changes back into my branch and I&#39;m not sure how to resolve them.

I created my own fork. I cloned it. I made changes to the branch on my fork, committed, and pushed. But then the main fork updated, and I tried to update my own fork by merging upstream in like so:

    $ cd repo-name
    $ git remote add upstream git://github.com/username/repo-name.git
    $ git fetch upstream
    $ git merge upstream/master

The merge says that there&#39;s some problem with a file and auto-merging doesn&#39;t work. It tells me to fix it myself and re-merge. So I actually went to the (upstream) repository on GitHub of the main fork and copied all the code of the new file into the file on my fork, and tried to merge again. Then, git gives me this error:

&gt; fatal: &#39;merge&#39; is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39; as
appropriate to mark resolution and make a commit, or use &#39;git commit -a&#39;.

Is there some argument I&#39;m leaving out? Am I doing something stupid? What does it mean by &quot;unmerged files?&quot; Isn&#39;t the whole point of merging to merge files? Do I have to commit my changes before I merge?

Trouble merging upstream changes back into my branch

I have a working copy for my entire repository, which contains multiple Python projects.  When I choose right-click --&gt; SVN Update in Windows File Explorer I am getting an error message listing a particular project folder:

    Command: Update
    Updating: path\to\working\copy
    Skipped obstructing working copy: path\to\working\copy\project
    Completed: At revision: 176
    Warning!: One or more files are in a conflicted state.

When I go to that project and right-click --&gt; SVN Update, it updates successfully.  There is also not conflict editor available and when I right-click --&gt; TortoiseSVN --&gt; Resolved there are not files available.

What could be causing the conflict?  As long as this keeps occurring, it is impossible to update this project in my working copy.

TortoiseSVN reports conflict, but no conflict can be found

[Wikipedia][1] says a 3-way merge is less error-prone than a 2-way merge, and often times doesn&#39;t need user intervention. Why is this the case?

An example where a 3-way merge succeeds and a 2-way merge fails would be helpful.


  [1]: http://en.wikipedia.org/wiki/Merge_%28revision_control%29#Three-way_merge

Why is a 3-way merge advantageous over a 2-way merge?

I have some local files, I pull from remote branch and there are conflicts.  I know that I would like to keep my local changes and ignore the remote changes causing conflicts. Is there a command I can use to in effect say &quot;mark all conflicts as resolved, use local&quot;?

How can I discard remote changes and mark a file as &quot;resolved&quot;?

When doing a git rebase, I often have difficulty working out what is happening with the &#39;local&#39; and &#39;remote&#39; when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next.

This is probably (definitely) because I still haven&#39;t properly understood.

When rebasing, who is &#39;local&#39; and who is &#39;remote&#39;?

(I use P4Merge for resolving conflicts)

git rebase, keeping track of &#39;local&#39; and &#39;remote&#39;

I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within.

For this question, lets say my superproject is called `supery` and the submodule is called `subby`. (Then is a simplification of what I&#39;m trying to do...I&#39;m not actually using the branches for versions, but I thought it would be easiest to lay out as a question.)

My master branch of `supery` has the tag `v1.0` of the git project `subby` referenced as a submodule. The branch of `supery` called `one.one` and changed the reference of the submodule to point to the tag `v1.1` of `subby`.

I can work  within each of these branches without a hitch, but if I try to update the `one.one` branch with changes from the `master` branch I receive some conflicts and I don&#39;t how to resolve them.

Basically after running a `git pull . master` while in the `subby` branch, it looks like it creates additional submodules.

Before the pull/merge, I get the desired response from `git submodule` from the `one.one` branch:

    $ git checkout master
    $ git submodule
    qw3rty...321e subby (v1.0)
    $ git checkout one.one
    $ git submodule
    asdfgh...456d subby (v1.1)

But after the pull, it adds additional submodules when I run `git submodule`:

    $ git pull . master
    Auto-merged schema
    CONFLICT (submodule): Merge conflict in subby - needs qu3rty...321e
    Automatic merge failed; fix conflicts and then commit the results.

    $ git submodule
    qw3rty...321e subby (v1.0)
    asdfgh...456d subby (v1.1)
    zxcvbn...7890 subby (v1.1~1)

How do I delete/ignore the unwanted submodule references and commit my conflicts and changes? Or is there a parameter I can use with my original `git pull` that will ignore my submodules?





How do I manage conflicts with git submodules?

Is there a way to resolve conflict for all files using checkout `--ours` and `--theirs`? I know that you can do it for individual files but couldn&#39;t find a way to do it for all.

Git resolve conflict using --ours/--theirs for all files

I&#39;m a webpack rookie who wants to learn all about it.
I came across a conflict when running my webpack telling me: 

&gt; ERROR in chunk html [entry]  app.js  Conflict: Multiple assets emit to
&gt; the same filename app.js

What should I do to avoid the conflict?

This is my webpack.config.js:

&lt;!-- begin snippet: js hide: false console: true babel: false --&gt;

&lt;!-- language: lang-js --&gt;

    module.exports = {
      context: __dirname + &quot;/app&quot;,

      entry: {
        &#39;javascript&#39;: &quot;./js/app.js&quot;,
        &#39;html&#39;: &quot;./index.html&quot;,
      },
      output: {
        path: __dirname + &quot;/dist&quot;,
        filename: &quot;app.js&quot;,
      },
      resolve: {
        extensions: [&#39;.js&#39;, &#39;.jsx&#39;, &#39;.json&#39;]
      },
      module: {
        loaders: [
          {
            test: /\.jsx?$/,
            exclude: /node_modules/,
            loaders: [&quot;babel-loader&quot;]
          },
          {
            test: /\.html$/,
            loader: &quot;file-loader?name=[name].[ext]&quot;,
          }
        ]
      }
    };


&lt;!-- end snippet --&gt;



Conflict: Multiple assets emit to the same filename

I want to know an exact algorithm (or near that) behind &#39;git merge&#39;. The answers at least to these sub-questions will be helpful:

 - How does git detect the context of a particular non-conflicting change?
 - How does git find out that there is a conflict in these exact lines?
 - Which things does git auto-merge?
 - How does git perform when there is no common base for merging branches?
 - How does git perform when there are multiple common bases for merging branches?
 - What happens when I merge multiple branches at once?
 - What is a difference between merge strategies?

But the description of a whole algorithm will be much better.

How does &#39;git merge&#39; work in details?

What should I do if I have two libraries that provide functions with equivalent names?

What should I do if two libraries provide a function with the same name generating a conflict?

Let&#39;s assume I `merge` git and there is a merge conflict.

My question is: how can I force git to always choose the newer version of code in conflict so I won&#39;t need to resolve the conflict by hand?

Force Git to always choose the newer version during a merge?

I have a view hierarchy that looks something like this:

    UIView (A)
    UIView &gt; UIImageView
    UIView &gt; UIView (B)
    UIView &gt; UIView (B) &gt; Rounded Rect Button
    UIView &gt; UIView (B) &gt; UIImageView
    UIView &gt; UIView (B) &gt; UILabel

I&#39;ve attached gesture recognizer(s) to my UIView (B). The problem that i&#39;m facing is that i don&#39;t get any actions for the Rounded Rect Button which is inside the UIView (B). The singleTap gesture recognizer captures/overrides the button&#39;s Touch Up Inside event. 

How can i make it work? I thought that the responder chain hierarchy will make sure that the button touch event will be given preference, and it WILL get triggered! What am i missing?

Here&#39;s some related code:


    #pragma mark -
    #pragma mark View lifecycle (Gesture recognizer setup)
    
    - (void)viewDidLoad {
        [super viewDidLoad];
    	
        // double tap gesture recognizer
        UITapGestureRecognizer *dtapGestureRecognize = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(doubleTapGestureRecognizer:)];
        dtapGestureRecognize.delegate = self;
        dtapGestureRecognize.numberOfTapsRequired = 2;
        [self.viewB addGestureRecognizer:dtapGestureRecognize];
        
        // single tap gesture recognizer
        UITapGestureRecognizer *tapGestureRecognize = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureRecognizer:)];
        tapGestureRecognize.delegate = self;
        tapGestureRecognize.numberOfTapsRequired = 1;
        [tapGestureRecognize requireGestureRecognizerToFail:dtapGestureRecognize];
        [self.viewB addGestureRecognizer:tapGestureRecognize];
            
    	// add gesture recodgnizer to the grid view to start the edit mode
    	UILongPressGestureRecognizer *pahGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressGestureRecognizerStateChanged:)];
    	pahGestureRecognizer.delegate = self;
    	pahGestureRecognizer.minimumPressDuration = 0.5;
        [self.viewB addGestureRecognizer:pahGestureRecognizer];
        
        [dtapGestureRecognize release];
        [tapGestureRecognize release];
        [pahGestureRecognizer release];
    }
    
    #pragma mark -
    #pragma mark Button actions
    
    - (IBAction)buttonTouchUpInside:(id)sender {
        NSLog(@&quot;%s, %@&quot;, __FUNCTION__, sender);
    }
    
    #pragma mark -
    #pragma mark Gesture recognizer actions
    
    
    - (void)singleTapGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
        NSLog(@&quot;%s&quot;, __FUNCTION__);
    }
    
    - (void)doubleTapGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
        NSLog(@&quot;%s&quot;, __FUNCTION__);
    }
    
    - (void)longPressGestureRecognizerStateChanged:(UIGestureRecognizer *)gestureRecognizer {
    	
    	switch (gestureRecognizer.state) {
    			
            case UIGestureRecognizerStateEnded: {
                NSLog(@&quot;%s&quot;, __FUNCTION__);
    			
    			break;
    		}
    		default:
    			break;
    	}
    }



Gesture recognizer and button actions

We maintain web application which has common master branch and many parallel branches, one for each installation, each have few specific changes. Source code is managed in git and it is terrific tool when we need transfer features and bugfixes from master branch into parallel ones. But are few files that are sensitive and automatic merging usually give bad results. So merging would be much easier if they can be somehow marked and every merge would result in conflict requiring manual merge.

I searched for an answer :

 1. I am using **--no-commit** and **--no-ff** merge options, but it is not the same.
 2. [Here][1] and [here][2] someone asks the same question but with no solution.
 3. Similar case seems to be [how to prevent file being merged][3] using .gitattributes containing: **somefile.php merge=ours** . I tried to find some merge option which would generate conflict or force manual merge but found none so far.
 4. .gitattributes containing: **somefile.php -merge** is never merged automatically and therefore forcing manual merge. It is 90% solution, but what I seek is to try automatic merge and mark it as conflict regardless it is successful or not. **But this is so far closest to solution.** *(...thanks Charles Bailey for clarification...)*
 5. Someone suggest to write custom merge driver ([1][4], [2][5]), but how to do it is far from clear to me. 

**edit:** variant 4. description

  [1]: http://kerneltrap.org/mailarchive/git/2008/11/9/4047284/thread
  [2]: http://git.661346.n2.nabble.com/force-a-merge-conflict-td1477477.html
  [3]: https://stackoverflow.com/questions/4515679/git-workflow-can-i-prevent-a-certain-file-from-being-merged-to-another-branch-bu
  [4]: https://stackoverflow.com/questions/3038185/manual-merge-on-git
  [5]: https://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-

Git - how to force merge conflict and manual merge on selected file

I need to load to R packages : tseries and chron

Both have a function named is.weekend

I always have in my environment the function from the second package I loaded.

How can I access always the function from, let say, chron ?


R: 2 functions with the same name in 2 different packages

After doing a merge and resolving conflicts, is there an &quot;easy&quot; way to just accept the default generated commit message from the command line?  One of our developers will resolve all the conflicts, and then do a `git commit -m&quot;Merge Commit&quot;` which replaces the generated commit message that listed all the conflict files.  I would like to have a different flag that would just take the current file without modification.  I know there is a -F or --file= option, but that requires knowing the file name all the time.

Thank you

How to use the default git commit message after resolving merge conflicts?

There are two members in our team. We use Xcode&#39;s SCM (use SVN) to manger our source code files.   
We all add files to our Xcode project. He has committed to SVN server. When I update, Xcode find there has conflicts in `project.pbxproj` file. Then I select quit `Xcode` and manually merge the conflicts. Then I  start to edit my `project.pbxproj`, merge our changes. Actually I don&#39;t know how Xcode manage files, I just add some text that my `project.pbxproj` file did&#39;t have. When I finish, my project can&#39;t open. I guess that because the `project.pbxproj` file can&#39;t be edit by manual.

So, I want to know, when you find this problem, the project.pbxproj file have conflicts, how to solve it?

Thank you! 

How to merge conflicts (file project.pbxproj) in Xcode use svn?

I&#39;m adding TextViews programmatically in a for-loop and add them to an ArrayList.

How do I use `TextView.setId(int id)`? What Integer ID do I come up with so it doesn&#39;t conflict with other IDs?

Android: View.setID(int id) programmatically - how to avoid ID conflicts?

I am using Git in Visual Studio. When I am trying to synchronize, the following message appears:

&gt; An error occured. Detailed message: An error was raised by libgit2. Cetegory = checkout(MergeConflict). 1 conflicts prevent checkout

I don&#39;t have a clue about what the conflicts are and how to fix them. Can anyone help me overcome this problem?

&quot;Conflicts prevent checkout&quot; error using Git in Visual Studio

I know I should be working on a branch of my own but a couple of us are on the same branch of a project. One of the Dev&#39;s made a commit and I just wanted to update my local copy with the latest  from SVN. Running &#39;svn update&#39; I get this output:

    Restored &#39;index.html&#39;
    U    somescript.php
    Conflict discovered in file.xml&#39;.
    Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: 

Is there an option/way to overwrite my local changes and get the latest file(s) from subversion and ignore all the conflicts? 

I&#39;ve looked at some of the other posts on Stack and they all don&#39;t answer the question. They say to delete the project and checkout again, which I guess if that&#39;s the best way so be it... But wanting more details as to why I can&#39;t force an update.
 Thanks

EDIT:

So I selected s &#39;show all options&#39;:

(s) show all options: s

      (e)  edit             - change merged file in an editor
      (df) diff-full        - show all changes made to merged file
      (r)  resolved         - accept merged version of file
    
      (dc) display-conflict - show all conflicts (ignoring merged version)
      (mc) mine-conflict    - accept my version for all conflicts (same)
      (tc) theirs-conflict  - accept their version for all conflicts (same)
    
      (mf) mine-full        - accept my version of entire file (even non-conflicts)
      (tf) theirs-full      - accept their version of entire file (same)
    
      (p)  postpone         - mark the conflict to be resolved later
      (l)  launch           - launch external tool to resolve conflict
      (s)  show all         - show this list

I guess I should go with option &#39;tc&#39;?



All Conflict Solutions on Gang of Coders

Total of 22 Conflict Solutions