This will do it if you&#39;re mid-merge:

    git merge test-development
    # Automatic merge failed, a bunch of conflicts!
    git checkout --theirs ./path
    git add ./path
    git commit

I have Nginx setup and displaying the test page properly. If I try to change the root path, I get a 403 Forbidden error, even though all permissions are identical. Additionally, the nginx user exists.

nginx.conf:

    user nginx;
    worker_processes  1;
    
    error_log  /var/log/nginx/error.log;
    
    pid        /run/nginx.pid;
    
    events {
        worker_connections  1024;
    }
    
    http {
        index   index.html index.htm;
    
        server {
            listen       80;
            server_name  localhost;
            root         /var/www/html; #changed from the default /usr/share/nginx/html
        }
    }

namei -om /usr/share/nginx/html/index.html

    f: /usr/share/nginx/html/index.html
    dr-xr-xr-x root root /
    drwxr-xr-x root root usr
    drwxr-xr-x root root share
    drwxr-xr-x root root nginx
    drwxr-xr-x root root html
    -rw-r--r-- root root index.html

namei -om /var/www/html/index.html

    f: /var/www/html/index.html
    dr-xr-xr-x root root /
    drwxr-xr-x root root var
    drwxr-xr-x root root www
    drwxr-xr-x root root html
    -rw-r--r-- root root index.html

error log

&gt; 2014/03/23 12:45:08 [error] 5490#0: *13 open()
&gt; &quot;/var/www/html/index.html&quot; failed (13: Permission denied), client:
&gt; XXX.XX.XXX.XXX, server: localhost, request: &quot;GET /index.html HTTP/1.1&quot;, host: &quot;ec2-XXX-XX-XXX-XXX.compute-1.amazonaws.com&quot;

Why does Nginx return a 403 even though all permissions are set properly?

I have inherited a Java project and am new to Java development. I feel a good way for me to get comfortable with the code is to write some tests around it. I&#39;m writing my code using IntelliJ.

My existing project has a folder structure like this:

    /myProject
      /src
        /main
          /java
            /com.lexcorp
              /core
                /email
                  /providers
                    emailProvider.java

I created a new project that will hold tests for this project. I would like this project to hold both unit and integration tests. Currently, my new project has a structure like this:

    /myProjectTests
      /src
        /main
          /java
            /com.lexcorp.core.email.providers
              emailProviderTest.java

The emailProviderTest.java file looks like the following:

    package com.lexcorp.core.email.providers;
    
    import junit.framework.TestCase;
    import org.junit.Test;
    
    public class EmailProviderTest extends TestCase {
    
        private final String username = &quot;[testAccount]&quot;;
    
        private final String password = &quot;[testPassword]&quot;;
    
        @Test
        public void thisAlwaysPasses() {
            assertTrue(true);
        }
    }

This project has a Run/Debug configuration with the following properties:

 - Test kind: All in package
 - Search for tests: In whole project

When I run this configuration, I get an error that says:

    junit.framework.AssertionFailedError: No tests found in com.lexcorp.core.email.providers.EmailProviderTest
    	at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:84)
    	at org.junit.runners.Suite.runChild(Suite.java:127)
    	at org.junit.runners.Suite.runChild(Suite.java:26)
    	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
    	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
    	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
    	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
    	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
    	at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
    	at org.junit.runner.JUnitCore.run(JUnitCore.java:160)
    	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:74)
    	at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:202)
    	at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:65)
    	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
    	at com.intellij.rt.execution.application.AppMain.main(AppMain.java:120)

I do not understand why I&#39;m getting an error that boils down to: &quot;No tests found&quot;. While my project structures differ, the folder structures on the OS match (which is another thing that confuses me). Why am I getting this error and how do I fix it?

junit: no tests found

I&#39;m trying to merge a git branch (test-development) back into master. There are lots of merge conflicts but I want as many as possible to be resolved via --theirs. Is there a way to tell git to merge with --theirs in bulk?

Git merge: accept theirs for multiple conflicts

<p>I'm trying to merge a git branch (test-development) back into master. There are lots of merge conflicts but I want as many as possible to be resolved via --theirs. Is there a way to tell git to merge with --theirs in bulk?</p>


I&#39;m using `Git-1.9.0-preview20140217` for Windows. As I know, this release should fix the issue with too long filenames. But not for me.

Surely I&#39;m doing something wrong: I did `git config core.longpaths true` and `git add .` and then `git commit`. Everything went well. But when I now do a `git status`, I get a list of files with `Filename too long`, for example:

&gt;`node_modules/grunt-contrib-imagemin/node_modules/pngquant-bin/node_modules/bin-wrapper/node_modules/download/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-handle-source-errors.js: Filename too long`

It is quite simple to reproduce for me: just create a [Yeoman][1] web application with the Angular generator (&quot;yo angular&quot;) and remove `node_modules` from the `.gitignore` file. Then repeat the aforementioned Git commands.

What am I missing here?

  [1]: https://en.wikipedia.org/wiki/Yeoman_(software)


Filename too long in Git for Windows

I&#39;m new to using Git, so I apologize if this is trivial.  I have a private repository set up using Github and [EGit][1].

To **update and merge** my local repository branch with the remote version (essentially a `git pull`), I use `Team &gt; Pull` in Eclipse.

To **merge** a branch *into* the master branch, I have to request and subsequently approve a **Pull Request** on Github.

&gt; What is the difference between calling `git pull` and sending a *pull request*?  

I&#39;ve seen that this is related to a **Fork and Pull** collaborative development model and is used for **code reviews**.  I think I understand the motivation and usefulness of a pull request, but what exactly is it?

  [1]: https://www.eclipse.org/egit/

Git Pull vs. Pull Request

I try to switch from Eclipse to IntelliJ IDEA. I have a project that uses Git and I want to quickly add files to *.gitignore* file. In Eclipse I can right click on a file/directory and choose &#39;*Add to .gitignore*&#39;.

Is there anything like this in IntelliJ IDEA or I have to edit the file manually?

How to add files/folders to .gitignore in IntelliJ IDEA?

I am very new to Git and I am planning to contribute to some open-source project on GitHub after discovering a small error in it. Upon forking it and fixing the error, I purposed a pull request and I noticed this showing up:  

&gt; Failed — The Travis CI build failed

Looking into the details I discovered it was caused by `Could not find .travis.yml`, which made perfect sense since I had not signed in to Travis Cl with and add .travis.yml to the repository.

This is my first time hearing about Travis and what that is known as continuous integration. And it sounds pretty cool so in order to learn more about it, I looked it up on Wikipedia.


&gt;  Travis CI is a hosted, distributed continuous integration service
&gt; used to build and test projects hosted at GitHub. Travis CI automatically detects when a commit has been made and pushed to a GitHub repository that is using Travis CI, and each time this happens, it will try to **build the project and run tests**. This includes commits to all branches, not just to the master branch.

My current understanding of Travis CI is that what it does is automatically pushing the project upon `git commit -am &quot;..&quot;` and I don&#39;t quite understand some part of it.

1. By **building the project and run tests**, what tests is it going to run? And how is it going to &quot;build&quot; the project? (like compiling it to binary?)

2. It states that &quot;This includes commits to all branches&quot; - but what if I don&#39;t want to commit to all branches?

3. Is it alright if I don&#39;t use Travis Cl at all? Under what circumstances is it best to use it (or it must be used)? 


Trying to understand what Travis CI does and when it should be used

Here&#39;s a workflow that I commonly deal with at work.

    git checkout -b feature_branch
    # Do some development
    git add .
    git commit
    git push origin feature_branch

At this point the feature branch is up for review from my colleagues, but I want to keep developing on other features that are dependent on `feature_branch`.  So while `feature_branch` is in review...

    git checkout feature_branch
    git checkout -b dependent_branch
    # Do some more development
    git add .
    git commit

Now I make some changes in response to the code review on feature_branch

    git checkout feature_branch
    # Do review fixes
    git add .
    git commit
    git checkout dependent_branch
    git merge feature_branch

Now this is where we get have problems.  We have a squash policy on master, which means that feature branches that are merged into master have to be squashed into a single commit.

    git checkout feature_branch
    git log # Look for hash at beginning of branch
    git rebase -i  first_hash_of_branch # Squash feature_branch into a single commit
    git merge master

Everything is cool, except with `dependent_branch`. When I try to rebase dependent branch onto master or try and merge master into it, git is confused by the re-written/squashed history and basically marks every single change in `depedendent_branch` as a conflict.  It&#39;s a PITA to go through and basically re-do or de-conflicticize all of the changes in `dependent_branch`. Is there some solution to this?  Sometimes, I&#39;ll manually create a patch and apply it off a fresh branch of master, but if there&#39;s any real conflicts with that, its even worse to fix.

    git checkout dependent_branch
    git diff &gt; ~/Desktop/dependent_branch.diff
    git checkout master
    git checkout -b new_dependent_branch
    patch -p1 &lt; ~/Desktop/dependent_branch.diff
    # Pray for a clean apply.

Any ideas?  I know this happens because of the re-written history during the squash, but that&#39;s a requirement that I can&#39;t change.  What&#39;s the best solution / workaround?  Is there some magic I can do?  Or is there a faster way to do all the steps involved with manually creating the diff?
    
    

Merging a branch of a branch after first branch is squashed when merged to master

I have two (or more) `Map&lt;String, Integer&gt;` objects. I&#39;d like to merge them with Java 8 Stream API in a way that values for common keys should be the maximum of the values.

    @Test
    public void test14() throws Exception {
        Map&lt;String, Integer&gt; m1 = ImmutableMap.of(&quot;a&quot;, 2, &quot;b&quot;, 3);
        Map&lt;String, Integer&gt; m2 = ImmutableMap.of(&quot;a&quot;, 3, &quot;c&quot;, 4);
        List&lt;Map&lt;String, Integer&gt;&gt; list = newArrayList(m1, m2);

        Map&lt;String, Integer&gt; mx = list.stream()... // TODO
        
        Map&lt;String, Integer&gt; expected = ImmutableMap.of(&quot;a&quot;, 3, &quot;b&quot;, 3, &quot;c&quot;, 4);
        assertEquals(expected, mx);
    }

How can I make this test method green?

I&#39;ve played with `collect` and `Collectors` for a while without any success.

(`ImmutableMap` and `newArrayList` are from Google Guava.)

Merging two Map&lt;String, Integer&gt; with Java 8 Stream API

I have 3 CSV files. Each has the first column as the (string) names of people, while all the other columns in each dataframe are attributes of that person. 

How can I &quot;join&quot; together all three CSV documents to create a single CSV with each row having all the attributes for each unique value of the person&#39;s string name?

The `join()` function in pandas specifies that I need a multiindex, but I&#39;m confused about what a hierarchical indexing scheme has to do with making a join based on a single index. 

pandas three-way joining multiple dataframes on columns

I am trying to LEFT Join 2 data frames but I do not want join all the variables from the second data set:

As an example, I have dataset 1 (DF1):

      Cl    Q   Sales  Date
       A	2	30	   01/01/2014
       A	3	24	   02/01/2014
       A	1	10	   03/01/2014
       B	4	10	   01/01/2014
       B	1	20	   02/01/2014
       B	3	30	   03/01/2014

And I would like to left join dataset 2 (DF2):


	Client	LO	CON
       A	12	CA
       B	11	US
       C	12	UK
       D	10	CA
       E	15	AUS
       F	91	DD


I am able to left join with the following code:

merge(x = DF1, y = DF2, by = &quot;Client&quot;, all.x=TRUE) :

       Client Q    Sales   Date             LO      CON
       A      2    30      01/01/2014       12      CA
       A      3    24      02/01/2014       12      CA
       A      1    10      03/01/2014       12      CA
       B      4    10      01/01/2014       11      US
       B      1    20      02/01/2014       11      US
       B      3    30      03/01/2014       11      US


However, it merges both column LO and CON. I would only like to merge the column LO.


       Client Q    Sales   Date             LO      
       A      2    30      01/01/2014       12      
       A      3    24      02/01/2014       12      
       A      1    10      03/01/2014       12      
       B      4    10      01/01/2014       11      
       B      1    20      02/01/2014       11     
       B      3    30      03/01/2014       11      

Left join only selected columns in R with the merge() function

I&#39;m working on a team with a few developers using git on BitBucket. We are all working on a `dev` branch, not pushing to `master` until a release.

One of the developers committed incorrect code that overwrote my own by accident, and now I am trying to push the correct code  back to the repo. I have been reading about this error for a few days now, I can&#39;t push to the repo anymore because I am getting the following error:


     ! [rejected]        master -&gt; dev (fetch first)
    error: failed to push some refs to &#39;https://myusername@bitbucket.org/repo_user/repo_name.git&#39;
    hint: Updates were rejected because the remote contains work that you do
    hint: not have locally. This is usually caused by another repository pushing
    hint: to the same ref. You may want to first integrate the remote changes
    hint: (e.g., &#39;git pull ...&#39;) before pushing again.
    hint: See the &#39;Note about fast-forwards&#39; in &#39;git push --help&#39; for details.

I follow the instructions and `pull`, but then I receive a merge conflict. After entering a message for the merge conflict, my local code is now the incorrect code that the other developer uploaded by accident (as expected from the `pull`). So I replace the incorrect code with the backup I copied before committing, and when I try to push again, I get the same error. 

It is really frustrating, I really want to help out my team and contribute, but I can&#39;t because of this error. Does anyone know how to solve this issue? I would very much appreciate any help.

These are the commands I run in order to commit if it helps anyone out:

    git pull remotename master:dev
    git add --all
    git commit -m &quot;some message&quot;
    git pull remotename master:dev
    git push remotename master:dev

I would have thought that if I kept this order, I would not receive merge conflicts. I guess I was wrong. Thanks again

Update:
I should add that I have looked for a few hours on Google and StackOverflow, and followed different instructions, but I still can&#39;t `push` to the `dev` branch.

Updates were rejected because the remote contains work that you do not have locally

I have branch `Master`, `branchA` and `branchB`. 
Now I&#39;m working in the `branchA` and I need to merge `branchA` with `branchB` and proceed my work in the `branchA`. All files are comitted in the `branchA` and `branchB`.

What&#39;s the fast way to implement it?

Git merge two local branches

When I do a Get Latest in Visual Studio, if there are conflicts, there is nothing that is displayed to me to make it obvious. Invariably I think everything is OK, do a build, and often the build works.

The onus is always on me to remember to look for conflicts, to open the Conflicts window.
Is there any way to make VS get in my face, and tell me that there is now a conflict?

How to get Visual Studio to open Resolve Conflicts window after a TFS Get

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 using [SourceTree](http://www.sourcetreeapp.com/) as my git tool on Windows.

I have a *main* branch and a *feature* branch and I can&#39;t get SourceTree to perform a rebase when I have a conflict.

*main* looks like:
&gt;c1 -&gt; c2 -&gt; c4 -&gt; c5

*feature* looks like:
&gt;c1-&gt; c2 -&gt; c3

I want to rebase *feature* so it will be:
&gt;c1 -&gt; c2-&gt; c4-&gt; c5-&gt; c3

There is a conflict between *c3* and *c5*.  I can resolve the conflict, but when I commit the changes I get a *HEAD* tag and looking at my graph I can see that *feature* branch wasn&#39;t rebased.  

How can I get the rebase to work?




Using Source Tree, rebase with conflict, rebase doesn&#39;t work after conflict resovled

When I try to pull in my project directory in the terminal, I see the following error:

    harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master
    U app/config/app.php
    U app/config/database.php
    U app/routes.php
    Pull 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, or use &#39;git commit -a&#39;.

Why does git say `&quot;Pull is not possible because you have unmerged files&quot;`, and how can I resolve it?

Why does git say &quot;Pull is not possible because you have unmerged files&quot;?

I&#39;ve created pull request I got into this:

[![enter image description here][1]][1]

&quot;Approve&quot; button does nothing and complete is disabled.

How do I resolve this confligt in pull request?

  [1]: https://i.stack.imgur.com/7KKqE.png

Content Type	Original Author	Original Content on Stackoverflow
Question	SecondGear	View Question on Stackoverflow
Solution 1 - Git	Ash Wilson	View Answer on Stackoverflow

Git merge: accept theirs for multiple conflicts

Git Problem Overview

Git Solutions

Solution 1 - Git

junit: no tests found

Why does Nginx return a 403 even though all permissions are set properly?

Attributions