StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POGit unmerged paths
text
Body
copied!<p>I have the following <code>git status</code> and I need to get rid of the two plugins below:</p> <pre><code># Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # unmerged: vendor/plugins/pluginA # unmerged: vendor/plugins/pluginB </code></pre> <p>In issue is that I have a repository with a few branches that is shared between us and the client:</p> <p><strong>master</strong> (client version of the code)<br> <strong>production</strong> (our production version of the code)<br> <strong>development</strong> (our development version of the code)</p> <p>Changes have been made in <code>master</code> that we need to start using and I need to leave <code>production</code> and <code>development</code> alone. I've created a new "merge" branch (based on development) and merged the code from master. Unfortunately it has left us with the two plugin issues above. These were removed in the <code>master</code> but are still in the <code>development</code> branch. When merging I had messages like:</p> <blockquote> <p>CONFLICT (directory/file): There is a directory with name vendor/plugins/pluginA in HEAD. Adding vendor/plugins/pluginA as vendor/plugins/pluginA~master</p> </blockquote> <p>Since I am trying to get the <code>master</code> version, how can I just remove the plugins? Seems like most other deleted files were merged correctly. </p> <p>Thanks!</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload