It is not exactly the &quot;newer&quot; version, but you can tell git to always prefer the version on the current branch using `git merge branch -X ours`, or to prefer the version of the branch being merged, using `git merge branch -X theirs`.

From `man git-merge`:

&gt; **ours:**
&gt;
&gt; This option forces conflicting hunks to be auto-resolved cleanly by favoring our version. Changes from the other tree that do not
&gt; conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side.
&gt;
&gt; **theirs:**
&gt; 
&gt; This is the opposite of &quot;ours&quot;.

I use this,

    git fetch --prune
    git reset --hard origin/master

Take a look at my answer in https://stackoverflow.com/questions/68604789/git-timestamp-based-automated-sync?noredirect=1&amp;lq=1

Essentially we have to do manual timestamp comparison. I do not think ```git merge``` has any built-in utility for this.

Consider the following program:

    #include &lt;string&gt;
    #include &lt;vector&gt;
    
    using namespace std;
    
    struct T
    {
    	int a;
    	double b;
    	string c;
    };
    
    vector&lt;T&gt; V;
    
    int main()
    {
    	V.emplace_back(42, 3.14, &quot;foo&quot;);
    }

It doesn&#39;t work:

    $ g++ -std=gnu++11 ./test.cpp
    In file included from /usr/include/c++/4.7/x86_64-linux-gnu/bits/c++allocator.h:34:0,
                     from /usr/include/c++/4.7/bits/allocator.h:48,
                     from /usr/include/c++/4.7/string:43,
                     from ./test.cpp:1:
    /usr/include/c++/4.7/ext/new_allocator.h: In instantiation of ‘void __gnu_cxx::new_allocator&lt;_Tp&gt;::construct(_Up*, _Args&amp;&amp; ...) [with _Up = T; _Args = {int, double, const char (&amp;)[4]}; _Tp = T]’:
    /usr/include/c++/4.7/bits/alloc_traits.h:253:4:   required from ‘static typename std::enable_if&lt;std::allocator_traits&lt;_Alloc&gt;::__construct_helper&lt;_Tp, _Args&gt;::value, void&gt;::type std::allocator_traits&lt;_Alloc&gt;::_S_construct(_Alloc&amp;, _Tp*, _Args&amp;&amp; ...) [with _Tp = T; _Args = {int, double, const char (&amp;)[4]}; _Alloc = std::allocator&lt;T&gt;; typename std::enable_if&lt;std::allocator_traits&lt;_Alloc&gt;::__construct_helper&lt;_Tp, _Args&gt;::value, void&gt;::type = void]’
    /usr/include/c++/4.7/bits/alloc_traits.h:390:4:   required from ‘static void std::allocator_traits&lt;_Alloc&gt;::construct(_Alloc&amp;, _Tp*, _Args&amp;&amp; ...) [with _Tp = T; _Args = {int, double, const char (&amp;)[4]}; _Alloc = std::allocator&lt;T&gt;]’
    /usr/include/c++/4.7/bits/vector.tcc:97:6:   required from ‘void std::vector&lt;_Tp, _Alloc&gt;::emplace_back(_Args&amp;&amp; ...) [with _Args = {int, double, const char (&amp;)[4]}; _Tp = T; _Alloc = std::allocator&lt;T&gt;]’
    ./test.cpp:17:32:   required from here
    /usr/include/c++/4.7/ext/new_allocator.h:110:4: error: no matching function for call to ‘T::T(int, double, const char [4])’
    /usr/include/c++/4.7/ext/new_allocator.h:110:4: note: candidates are:
    ./test.cpp:6:8: note: T::T()
    ./test.cpp:6:8: note:   candidate expects 0 arguments, 3 provided
    ./test.cpp:6:8: note: T::T(const T&amp;)
    ./test.cpp:6:8: note:   candidate expects 1 argument, 3 provided
    ./test.cpp:6:8: note: T::T(T&amp;&amp;)
    ./test.cpp:6:8: note:   candidate expects 1 argument, 3 provided

What is the correct way to do this and why?

(Also tried single and double braces)

C++11 emplace_back on vector&lt;struct&gt;?

```
{
  &quot;key1&quot;: &quot;value1&quot;,
  &quot;key2&quot;: &quot;value2&quot;,
  &quot;key3&quot;: &quot;value3&quot;
}
```

How I can get each item&#39;s key and value without knowing the key nor value beforehand?

Android JSONObject - How can I loop through a flat JSON object to get each key and value

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?

<p>Let's assume I <code>merge</code> git and there is a merge conflict.</p>
<p>My question is: how can I force git to always choose the newer version of code in conflict so I won't need to resolve the conflict by hand?</p>


I am a WordPress Designer/Developer, who is getting more and more heavily involved with using version control, notably Git, though I do use SVN for some projects. I am currently using Beanstalk for my remote repo.

Adding all of the WordPress files to my repo is no problem, if I wanted to I know I could .gitignore the wp-config file, but since I&#39;m the only developer, currently, and these projects are closed source, it really makes little sense.

WordPress relies heavily on the database, as any CMS does, to keep textual content, and many settings depending on the specific plugin/theme configuration I&#39;m using. I&#39;m wondering what the best way of using version control on the database would be, if it&#39;s even possible. I guess I could do a SQL dump, though my MySQL server is running on Windows (read as: I don&#39;t know how to do it), and then add the SQL dump to my repository. But when I push something live, that poses huge security threats.

Is there an accepted practice of doing this?

Using version control (Git) on a MySQL database

How to create patch suitable for reviewing in crucible?

    git diff branch master --no-prefix &gt; patch

This generates only 3 lines of context. So I do the following

    git diff --unified=2000 branch master --no-prefix &gt; patch

Hopefully all files will have less than 2000 lines. Is there a way to tell git to include all the lines in the file for patch without having to specify maximum lines?

How to get git diff with full context?

I have local changes to a file that I don&#39;t want to commit to my repository. It is a configuration file for building the application on a server, but I want to build locally with different settings. Naturally, the file always shows up when I do &#39;git status&#39; as something to be staged. I would like to hide this particular change and not commit it. I won&#39;t make any other changes to the file.

To clarify, using .gitignore is not what I want since that only prevents new files from being added. I want to ignore changes to a file already in the repository.
 
After some digging around, I see 2 options: `assume-unchanged` and `skip-worktree`. A previous question [here](https://stackoverflow.com/questions/6138076/git-assume-unchanged-vs-skip-worktree) talks about them but doesn&#39;t really explain their differences. 

How are the two commands different? Why would someone use one or the other?

Git - Difference Between &#39;assume-unchanged&#39; and &#39;skip-worktree&#39;

Using the GitHub Windows client I did a *sync* to pull remote changes to my local machine, but before finishing the sync, I ran out of disk space and the sync failed.  Now I seem to have a bunch of local changes that are actually changes that were being pulled from origin.  I tried to run git pull but got:

	C:\Users\Tom\SourceLog [master +4 ~26 -0 !]&gt; git pull
	Updating b3a86e1..5afd74f
	error: Your local changes to the following files would be overwritten by merge:
			SourceLog.Interface/IChangedFile.cs
			SourceLog.Interface/ILogEntry.cs
			...
	Please, commit your changes or stash them before you can merge.
	error: The following untracked working tree files would be overwritten by merge:
			Lib/MSBuildExtensionPack/4.0.6.0/Ionic.Zip.dll
			Lib/MSBuildExtensionPack/4.0.6.0/MSBuild.ExtensionPack.dll
			...
	Aborting

So now I&#39;m trying to discard the local changes but I&#39;m getting:

	C:\Users\Tom\SourceLog [master +4 ~26 -0 !]&gt; git checkout -- .
	Rename from &#39;.git/index.lock&#39; to &#39;.git/index&#39; failed. Should I try again? (y/n) y
	Rename from &#39;.git/index.lock&#39; to &#39;.git/index&#39; failed. Should I try again? (y/n) n
	fatal: unable to write new index file

How can I clean this up?  (I didn&#39;t have any local changes before starting the sync.)


Update
------

Can&#39;t seem to reset head..

	C:\Users\Tom\SourceLog [master +4 ~0 -0 !]&gt; git reset head
	Rename from &#39;.git/index.lock&#39; to &#39;.git/index&#39; failed. Should I try again? (y/n) y
	Rename from &#39;.git/index.lock&#39; to &#39;.git/index&#39; failed. Should I try again? (y/n) n
	error: Could not write new index file.
	fatal: Could not reset index file to revision &#39;head&#39;.

Git rename from index.lock to index failed

I want to download a .zip with the source of a library hosted on github, but I don&#39;t want the master, because every time I download I could be downloading a different version.

This particular library does not have tags, so I can&#39;t use that.

So how do I download the source.zip for a specific commit sha?

How to download .zip from GitHub for a particular commit sha?

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?

I had two branches: `master` and `branch1`. I just merged `branch1` back into `master` and I&#39;m done with that branch. Should I delete it or just let it sit around? Will deleting it cause any loss of data?

What to do with branch after merge

&gt; **Possible Duplicate:**  
&gt; [Merge multiple data frames in a list simultaneously](https://stackoverflow.com/questions/8091303/merge-multiple-data-frames-in-a-list-simultaneously)  

&lt;!-- End of automatically inserted text --&gt;

example `data.frames`:

     df1 = data.frame(id=c(&#39;1&#39;,&#39;73&#39;,&#39;2&#39;,&#39;10&#39;,&#39;43&#39;),v1=c(1,2,3,4,5)) &lt;br&gt;
     df2 = data.frame(id=c(&#39;7&#39;,&#39;23&#39;,&#39;57&#39;,&#39;2&#39;,&#39;62&#39;,&#39;96&#39;),v2=c(1,2,3,4,5,6)) &lt;br&gt;
     df3 = data.frame(id=c(&#39;23&#39;,&#39;62&#39;),v3=c(1,2)) &lt;br&gt;

Note: `id` is unique for each data.frame. I want the resulting matrix to look like

    1      1 NA NA 
    2      3  4 NA 
    7      NA 1 NA 
    10     4 NA NA 
    23     NA 2  1 
    43     5 NA NA 
    57     NA 3 NA 
    62     NA 5  2 
    73     2 NA NA 
    96     NA 6 NA
 
In this case, I only show 3 datasets, I actually have at least 22 of them so at the end I want a matrix of nx(22+1) where n is the number of ids for all 22 datasets. &lt;br&gt;

Given 2 datasets, I need to get their `ids` in the first column and 2nd and 3rd columns are filled with the values, if there is no value exists, then input `NA` instead.

Merging a lot of data.frames

I have some columns in R and for each row there will only ever be a value in one of them, the rest will be NA&#39;s. I want to combine these into one column with the non-NA value. Does anyone know of an easy way of doing this. For example I could have as follows:

    data &lt;- data.frame(&#39;a&#39; = c(&#39;A&#39;,&#39;B&#39;,&#39;C&#39;,&#39;D&#39;,&#39;E&#39;),
                       &#39;x&#39; = c(1,2,NA,NA,NA),
                       &#39;y&#39; = c(NA,NA,3,NA,NA),
                       &#39;z&#39; = c(NA,NA,NA,4,5))

So I would have

    &#39;a&#39; &#39;x&#39; &#39;y&#39; &#39;z&#39;  
     A   1   NA  NA  
     B   2   NA  NA  
     C  NA   3   NA  
     D  NA   NA  4  
     E  NA   NA  5

And I would to get
  
     &#39;a&#39; &#39;mycol&#39;  
      A   1  
      B   2  
      C   3  
      D   4  
      E   5  

The names of the columns containing NA changes depending on code earlier in the query so I won&#39;t be able to call the column names explicitly, but I have the column names of the columns which contains NA&#39;s stored as a vector e.g. in this example `cols &lt;- c(&#39;x&#39;,&#39;y&#39;,&#39;z&#39;)`, so could call the columns using `data[, cols]`.

Any help would be appreciated.

Thanks


Combine column to remove NA&#39;s

I&#39;m thinking if there is a way that when I merge a branch into another branch that ALL changed files are listed in my commit message and not just the ones which were modified in both branches.
This would give me a better overview of what was changed in the branch just by seeing the merge commit.
Is there a way to do this?

List all modified files in git merge commit - even the fast forwarded

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

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?

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

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.

Content Type	Original Author	Original Content on Stackoverflow
Question	bartek	View Question on Stackoverflow
Solution 1 - Git	Renato Zannon	View Answer on Stackoverflow
Solution 2 - Git	wolfgang	View Answer on Stackoverflow
Solution 3 - Git	SmoothKen	View Answer on Stackoverflow

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

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Android JSONObject - How can I loop through a flat JSON object to get each key and value

C++11 emplace_back on vector<struct>?

Attributions