The line (or lines) between the lines beginning `&lt;&lt;&lt;&lt;&lt;&lt;&lt;` and `======` here:

    &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.txt
    Hello world
    =======

... is what you already had locally - you can tell because `HEAD` points to your current branch or commit.  The line (or lines) between the lines beginning `=======` and `&gt;&gt;&gt;&gt;&gt;&gt;&gt;`:

    =======
    Goodbye
    &gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

... is what was introduced by the other (pulled) commit, in this case `77976da35a11`.  That is the object name (or &quot;hash&quot;, &quot;SHA1sum&quot;, etc.) of the commit that was merged into `HEAD`.  All objects in git, whether they&#39;re commits (version), blobs (files), trees (directories) or tags have such an object name, which identifies them uniquely based on their content.

I have two projects, `ProjectA` and `ProjectB`.  `ProjectB` is a console application, which depends on `ProjectA`.  Yesterday, everything was working fine, but suddenly today when I run `ProjectB` I get this:

&gt; **BadImageFormatException was unhandled**:  
&gt; Could not load file or assembly &#39;ProjectA, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null&#39; or one of its dependencies. An attempt was made to load a program with an incorrect format.

Both are just regular projects, with no dependencies on any other non-.Net projects.  Both are fully .Net - there is no native code, and no P/Invoke.  I have other projects which depend on `ProjectA` and still work just fine.

Things I have tried:

 * Make sure both projects are set to &quot;Any CPU,&quot; with the *build* checkbox checked.  They are.
 * Make sure both projects are for the same Target Framework *(.Net 4.0 Client Profile)*.
 * Under ProjectB --&gt; References --&gt; ProjectA --&gt; Properties, make sure *&quot;Copy Local&quot;* is set to *&quot;True&quot;* _ *(I verified that ProjectA.dll is being copied correctly)*
 * Clean/Rebuild the solution.  I even tried manually deleting the /bin and /obj folders in both projects.
 * Restart Visual Studio.  Restart my computer.
 * Check out an entirely new copy of the repository.

But I still get the same error.  I have no idea what I did to cause this, nor how to fix it.  Any ideas?

Could not load file or assembly ... An attempt was made to load a program with an incorrect format (System.BadImageFormatException)

I would like to make a deep copy of a `dict` in python. Unfortunately the `.deepcopy()` method doesn&#39;t exist for the `dict`. How do I do that?

    &gt;&gt;&gt; my_dict = {&#39;a&#39;: [1, 2, 3], &#39;b&#39;: [4, 5, 6]}
    &gt;&gt;&gt; my_copy = my_dict.deepcopy()
    Traceback (most recent calll last):
      File &quot;&lt;stdin&gt;&quot;, line 1, in &lt;module&gt;
    AttributeError: &#39;dict&#39; object has no attribute &#39;deepcopy&#39;
    &gt;&gt;&gt; my_copy = my_dict.copy()
    &gt;&gt;&gt; my_dict[&#39;a&#39;][2] = 7
    &gt;&gt;&gt; my_copy[&#39;a&#39;][2]
    7
The last line should be `3`.

I would like that modifications in `my_dict` don&#39;t impact the snapshot `my_copy`.

How do I do that? The solution should be compatible with Python 3.x.

Deep copy of a dict in python

After I pulled from remote branch, I got conflict, when I open the file it looks something like below:

    &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.txt
    Hello world
    =======
    Goodbye
    &gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

I need some explanations of the markers, which portion of code is pulled from remote and which is from local?

What does the code `77976da35a11db4580b80ae27e8d65caf5208086` stand for?

Git conflict markers

After I pulled from remote branch, I got conflict, when I open the file it looks something like below:
<pre><code class="hljs language-markdown">&#x3C;&#x3C;&#x3C;&#x3C;&#x3C;&#x3C;&#x3C; HEAD:file.txt
Hello world
=======
Goodbye
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
</code></pre>
I need some explanations of the markers, which portion of code is pulled from remote and which is from local?
What does the code <code>77976da35a11db4580b80ae27e8d65caf5208086</code> stand for?

I&#39;ve added a submodule to my project in `project_dir/vendor/submodule_one` now each time I run `git status` I get `modified: vendor/submodule_one (new commits)`.

My question is whats the best way to deal with this? Do I add the `vendor/submodule_one`-folder to my `.gitignore` as my main project shouldn&#39;t need to know about the specifics of my submodule?

Or when I&#39;m changing and commiting changes to my submodule do I need to make commits in my main project also?

Just getting started with submodules and couldn&#39;t seem to find much info beyond setting them up.

Do you ignore a git submodule in your .gitignore or commit it to your repo?

I created a GitHub account, and I want to give someone write access so he can push just like me, there is a way to add a collaborator with a free plan? If not, what can I do? (besides buying a paid account, which I&#39;ll do in the future)



Adding a collaborator to my free GitHub account?

This question is similar to https://stackoverflow.com/questions/4545370/how-to-list-all-tags-pointing-to-a-specific-commit-in-git, but with one difference: I wish to search for all tags that contain a specific commit within the tree of each tag, not specifically the files marked in the tag itself (in this case, only the Makefile change has been tagged).

How to list all tags that contain a commit?

How do I set Git to automatically push to a remote
repository (including automatically providing my passphrase) after each commit to the local repository?




How can I automatically push after committing in Git?

I committed and pushed some directory to github. After that, I altered the `.gitignore` file adding a directory that should be ignored. Everything works fine, but the (now ignored) directory stays on github.

How do I delete that directory from github and the repository history?

Remove directory from remote repository after adding them to .gitignore

I tried to merge a file in the command line using Git, when an error message appeared telling me the merge was aborted. 

I thought that was the end of it, but then I realized there are gitmarks in my files. Like so:

    start =
    	expression
    	
    validchar = 
    	[0-9a-zA-Z_?!+\-=@#$%^&amp;*/.]
    
    integer = 
    &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
    	digits:[0-9]+
    		{ return digits.join(&quot;&quot;); }
    =======
    	sign:&quot;-&quot;* digits:[0-9]+
    		{ return sign + digits.join(&quot;&quot;); }
    &gt;&gt;&gt;&gt;&gt;&gt;&gt; gh-pages
    	
The files have been edited not by me and show lines inserted with: 

- HEAD after less than signs (`&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD`)
- lines of changed code 
- a string of equals signs (`=======`)
- the new version of the code
- another line starting with greater than signs and the name of the branch (`&gt;&gt;&gt;&gt;&gt;&gt;&gt; gh-pages`)

What&#39;s worse is that the file contents are no longer in order. Does anyone know how I get those files back to normal, and the changes I made in the gh-branch merged into the master branch?

Git merge left HEAD marks in my files

How do I resolve a git merge conflict in favor of pulled changes ? 

Basically I need to remove all conflicting changes from a working tree without having to go through all of the conflicts with a `git mergetool` while keeping all conflict-free changes. Preferably doing this while pulling, not afterwards.

Resolve Git merge conflicts in favor of their changes during a pull

When I do `git rebase branch1` in my `branch1-local` I get conflicts. I solve the conflict, do `git add &lt;conflicted-add&gt;` and then do `git rebase --continue` as git asks me to do. After that a new commit is applied. A new conflict shows up. But is the same conflict again in the same file. I do it again, `git add`, the `git rebase --continue`, and then it all repeats again until I repeat this for each commit being rebased on.

Why rebase is having me redo the same conflict resolution over and over again?


Why do I have to resolve the same &quot;git rebase&quot; conflict over and over?

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&#39;t know how to use vimdiff. What does each panel here mean and how should I proceed to fix the merge conflict?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/kxn1g.png

How do I use vimdiff to resolve a git merge conflict?

I am in the middle of rebasing after a `git pull --rebase`.  I have a few files that have merge conflicts.  How can I accept &quot;their&quot; changes or &quot;my&quot; changes for specific files?

    $ git status
    # Not currently on any branch.
    # You are currently rebasing.
    #   (fix conflicts and then run &quot;git rebase --continue&quot;)
    #   (use &quot;git rebase --skip&quot; to skip this patch)
    #   (use &quot;git rebase --abort&quot; to check out the original branch)
    #
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #
    #       modified:  CorrectlyMergedFile
    #
    # Unmerged paths:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #   (use &quot;git add &lt;file&gt;...&quot; to mark resolution)
    #
    #       both modified: FileWhereIWantToAcceptTheirChanges
    #       both modified: FileWhereIWantToAcceptMyChanges

Normally I just open the file or a merge tool and manually accept all &quot;their&quot; or &quot;my&quot; changes.  However, I suspect I&#39;m missing a convenient git command.

Also, note that I will only be able to choose a merge strategy for each file when I see what files hit conflicts an possibly what the conflicts are.

Content Type	Original Author	Original Content on Stackoverflow
Question	Mellon	View Question on Stackoverflow
Solution 1 - Git	Mark Longair	View Answer on Stackoverflow

Git conflict markers

Git Problem Overview

Git Solutions

Solution 1 - Git

Deep copy of a dict in python

Could not load file or assembly ... An attempt was made to load a program with an incorrect format (System.BadImageFormatException)

Attributions