     git merge -Xignore-all-space

Or (more precise)

     git merge -Xignore-space-change

should be enough to ignore all space related conflicts during the merge.

See [git diff][1]:

    --ignore-space-change

&gt; Ignore changes in amount of whitespace.  
This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. 

    --ignore-all-space

&gt; Ignore whitespace when comparing lines.  
This ignores differences even if one line has whitespace where the other line has none. 

[`ks1322`][2] adds in the comments a good advice:

&gt; It is worth to merge with **`--no-commit` and review the merge before actual commit**. 


-----

The [OP Callum Macrae][3] reports that, in that case, the merge proceed uninterrupted, and the trailing spaces contained in the pull request patches are applied to the local files.  
However, the OP uses a pre-commit hook which takes care of said trailing spaces.  
(I suppose a bit similar to [this one][4], also [referenced here][5]).

----

The OP&#39;s pre-commit hook is [referenced here][6]:

&gt; In addition to removing trailing whitespace, it removes one to three spaces before tabs (I have tab width set to 4), and adds EOLs.   
I&#39;ve had reports that the code that adds the EOL deletes the file in windows, but haven&#39;t been able to replicate it.


  [1]: http://linux.die.net/man/1/git-diff
  [2]: https://stackoverflow.com/users/72178/ks1322
  [3]: https://stackoverflow.com/users/902207/callum-macrae
  [4]: https://gist.github.com/1028787
  [5]: https://github.com/LockerProject/Locker/issues/257
  [6]: https://gist.github.com/2141321

If you see that you have a lot of whitespace issues in a merge, you can
simply abort it and do it again, this time with -Xignore-all-space or -Xignore-space-change. The first
option ignores whitespace completely when comparing lines, the second treats sequences of one or
more whitespace characters as equivalent.

I like to use [meld](https://meldmerge.org/) to merge involved conflicts and there is the option to set various filter options under `Meld&gt;Preferences&gt;TextFilters`.

I found the explanation defining `WIN32_LEAN_AND_MEAN` *&quot;reduces the size of the Win32 header files by excluding some of the less frequently used APIs&quot;*.  Somewhere else I read that it speeds up the build process.

So what does `WIN32_LEAN_AND_MEAN` exclude exactly?  Should I care about this pre-processor directive?  Does it speed up the build process?

I&#39;ve also seen a pre-processor directive in projects named something along the lines of extra lean.  Is this another esoteric pre-processor incantation I should know about?

What does #defining WIN32_LEAN_AND_MEAN exclude exactly?

I am looking for the command for creating a patch from the last commit made.

My workflow sometimes looks like this:

    vi some.txt
    git add some.txt
    git commit -m &quot;some change&quot;

Now I just want to write:

    git create-patch-from-last-commit-to-file SOME-PATCH0001.patch

What should I put there instead of `create-patch-from-last-commit-to-file`?

How do I simply create a patch from my latest git commit?

I&#39;ve got a problem, where a large commit which changes about a thousand lines of code, removing whitespace from the end of lines and removing spaces before tabs.

There are also about 50 pull requests for this project, in which all will get conflicts, when my commit is merged. Is there any way that git can be set up so that when merging future commits, it ignores conflicts where one of them is just a whitespace change?

Modifying git itself or using a third party tool isn&#39;t possible, but using a hook is fine.


Merging without whitespace conflicts

I've got a problem, where a large commit which changes about a thousand lines of code, removing whitespace from the end of lines and removing spaces before tabs.
There are also about 50 pull requests for this project, in which all will get conflicts, when my commit is merged. Is there any way that git can be set up so that when merging future commits, it ignores conflicts where one of them is just a whitespace change?
Modifying git itself or using a third party tool isn't possible, but using a hook is fine.

So I first forked a repo and then made a commit to that forked repo. I then opened a pull request. The pull request listed all the changes I wanted.

After reviewing my pull request, there were a number of changes that the repo owner wanted me to make before he accepted it. I have made those changes in my fork, now how do I update the pull request with those changes (or is this not how I should handle it)?

How to update a pull request from forked repo?

I am getting this error when I am trying push my files into heroku rep.

Ive set autocrlf = false already in gitconfig but this problem is still there.
i have also tried this solution [here](https://stackoverflow.com/questions/5669209/why-do-i-get-error-failed-to-push-some-refs)
but no gain.

Any suggestion is this possible that git is still using old config setting if yes then how can I refresh it.

Thankyou


    C:\myapp&gt;git push heroku
    To git@heroku.com:myapp.git
     ! [rejected]        master -&gt; master (non-fast-forward)
    error: failed to push some refs to &#39;git@heroku.com:myapp.git&#39;
    To prevent you from losing history, non-fast-forward updates were rejected
    Merge the remote changes (e.g. &#39;git pull&#39;) before pushing again.  See the
    &#39;Note about fast-forwards&#39; section of &#39;git push --help&#39; for details.


----------
while trying `git pull heroku master`

    warning: no common commits
    remote: Counting objects: 215, done.
    remote: Compressing objects: 100% (147/147), done.
    remote: Total 215 (delta 82), reused 132 (delta 62)Receiving objects:  79% (170/
    
    Receiving objects: 100% (215/215), 1.49 MiB | 107 KiB/s, done.
    Resolving deltas: 100% (82/82), done.
    From heroku.com:myapp
     * branch            master     -&gt; FETCH_HEAD
    Auto-merging start.php
    CONFLICT (add/add): Merge conflict in start.php
    Auto-merging src/appinfo.txt
    CONFLICT (add/add): Merge conflict in src/appinfo.txt
    Auto-merging result.php
    CONFLICT (add/add): Merge conflict in result.php
    Auto-merging landhere.php
    CONFLICT (add/add): Merge conflict in landhere.php
    Automatic merge failed; fix conflicts and then commit the result.

----------
while trying `git push heroku -f`

    F:\myapp&gt;git remote add heroku git@heroku.com:myapp.git
    F:\myapp&gt;git push heroku

    Counting objects: 41, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (40/40), done.
    Writing objects: 100% (41/41), 1.36 MiB | 12 KiB/s, done.
    Total 41 (delta 0), reused 0 (delta 0)
    
    -----&gt; Heroku receiving push
     !     Heroku push rejected, no Cedar-supported app detected

    To git@heroku.com:myapp.git
     ! [remote rejected] master -&gt; master (pre-receive hook declined)
    error: failed to push some refs to &#39;git@heroku.com:myapp.git&#39;

failed to push some refs to git@heroku.com

I have several files in a CodeIgniter site that I will want to have in the repo but not track any changes on.

For example, I deploy a new installation of this framework to a new client, I want the following files to be downloaded (they have default values CHANGEME) and I just have to make changes specific to this client (database credentials, email address info, custom CSS).


    // the production config files i want the files but they need to be updated to specific client needs
    application/config/production/config.php
    application/config/production/database.php
    application/config/production/tank_auth.php
    // index page, defines the environment (production|development)
    /index.php
    // all of the css/js cache (keep the folder but not the contents)
    /assets/cache/*
    // production user based styling (color, fonts etc) needs to be updated specific to client needs
    /assets/frontend/css/user/frontend-user.css

Currently if I run 

    git clone git@github.com:user123/myRepo.git httpdocs

and then edit the files above, all is great. Until I release a hotfix or patch and run `git pull`. All of my changes are then overwritten. 

Keep file in a Git repo, but don&#39;t track changes

My workflow: I have a fork (origin) of a remote project (upstream). I have created a branch, topic/TICKET. I want to create a pull request of my origin branch to the upstream project in a same-named, brand new &quot;topic/TICKET&quot; branch. In other words, I don&#39;t want my pull request toward the master branch or any existing branch.

When using BitBucket I have this option. When I create my PR, I select my origin branch and then the remote branch selection allows &quot;Create new branch (topic/TICKET)&quot;.

In GitHub I don&#39;t appear to have this option. I can type in the new branch name; but then the option to continue greys out until I select a valid, existing branch upstream.

The annoying work-around is creating the branches upstream before I perform the PR; but it requires asking someone who can commit upstream -- it seems to me like there must be an easier way to do this. 

So, is there any way with GitHub to create a pull request to create a new upstream branch, or is this just a known limitation?

GitHub Pull Request to a new Upstream Branch

I had a mistake and commit some changes to git which I should not have committed.
After I made the commit, I pushed my changes. 
I then used the following commands to try and reset my changes.

     git reset --hard head

Now I want to push this &#39;reset&#39; to the remote repository with this command:
   
    git push MyBranch
    
But I am getting this error:

    remote: error: denying non-fast-forward refs/heads/branch (you should pull first)

I tried to use this command without any success: 
 
    git push -f &quot;origin&quot; 

Any idea what I can do?

Can not push changes after using git reset --hard

I just lost part of my weekend because of this ... joker - zero width space. I just used some snippets from google groups and didn&#39;t recognize that there are doubled characters, because Idea (11) didn&#39;t show them, which was causing problems with parsing config file of my app... I discovered it accidentally in vi.

Is there any way to display such things in IntelliJ (or some other way to examine files) without using external editors.

IntelliJ 11 / Mac OS 10.7

**edit - sample**

These two lines looks identical, in browser and also in Idea. You can see in page&#39;s code that in first - commented line there is hidden zero width space between `mysql://` and `localhost`, which causes problems. Of course if you expect that &#39;joker&#39;, you can try to use search and replace it, however nobody expects the sign that should not be there, especially if he cannot see it in any way. 

    #db.default.url=&quot;jdbc:mysql://​localhost/play-fullcalendar&quot;
     db.default.url=&quot;jdbc:mysql://localhost/play-fullcalendar&quot;

How to display hidden characters by default (ZERO WIDTH SPACE ie. &amp;#8203)

At work we are several developers and don&#39;t have a code style guide, and some developers indent with tabs, and some others with 4 spaces (luckily noone of the indent with spaces people uses different than 4 spaces). In general this is no (big) problem because in our editors we set `tabwidth=4` and all the indentation seems correct.

But in `git diff` or `git show` that&#39;s what appears:

    diff --git a/mesclatabs.php b/mesclatabs.php
    new file mode 100644
    index 0000000..1986c91
    --- /dev/null
    +++ b/mesclatabs.php
    @@ -0,0 +1,5 @@
    +&lt;?php
    +function foo() {
    +       echo &quot;line with 1 tab\n&quot;;
    +    echo &quot;line with 4 spaces\n&quot;;
    +}

The problem is `git diff` or `git show` where each tabs appears as wide as 8 spaces (well, in reality appears as a tab, and the shell (bash in my case) is showing the tab as 8 spaces. I suppose there must be some bash config to change this, but I&#39;d like to know if git has an option to output tabs as 4 spaces in `diff` / `show`, as some developers work with `zsh` instead of `bash`.

Any ideas?


setting tabwidth to 4 in git show / git diff

Are there any tools / UNIX single liners which would remove trailing whitespaces for multiple files **in-place**.

E.g. one that could be used in the conjunction with *find*.

How to remove trailing whitespaces for multiple files?

i have defined some strings in the `strings.xml` file. Now I need to put some extra space between some numbers in the string. When I type extra space characters this is not showing on the application though.

Before:

    &lt;string name=&quot;spelatonertext3&quot;&gt;-4, 5, -5, 6, -6,

And if I put extra space like this:

    &lt;string name=&quot;spelatonertext3&quot;&gt;-4,  5, -5,   6,  -6,

It just looks the same on the app. How can I make space characters into the XML string?

How to put space character into a string name in XML?

Now that macros are gone from Visual Studio 2012, what is the best way to automatically trim trailing whitespace whenever a file is saved?

I&#39;m aware that *Format Document* (&lt;kbd&gt;Ctrl&lt;/kbd&gt; + &lt;kbd&gt;K&lt;/kbd&gt;, &lt;kbd&gt;Ctrl&lt;/kbd&gt; + &lt;kbd&gt;D&lt;/kbd&gt;) will do this, but it presumably changes the file in other ways, and it&#39;s not automatic either.

The motivation is given here:

*[Trailing whitespace is evil. Don&#39;t commit evil into your repo][1]*

  [1]: http://codeimpossible.com/2012/04/02/trailing-whitespace-is-evil-don-t-commit-evil-into-your-repo/


How can I trim trailing whitespace in Visual Studio 2012 on save?

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 there&#39;s a collison during `git merge`, I open a mergetool called [Meld][1]. It opens three files LOCAL, BASE and REMOTE. As I&#39;ve read LOCAL is my local branch, BASE is common ancestor and REMOTE is the branch to be merged.

Now to my question: which version of the file will be finally used? Is it REMOTE? If so, can I edit it as I want, regardless what&#39;s in the BASE branch for example?


  [1]: http://meldmerge.org/

Which version of the git file will be finally used: LOCAL, BASE or REMOTE?

I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch.  What I want is a way to merge my stashed changes with the current changes.  

Is there a way to do this?

Its more for convenience, I eventually gave up and committed first my current changes, then my stashed changes, but I would have preferred to get them in with one fell swoop.



git stash -&gt; merge stashed change with current changes

I have 2 branches A and B.

Whenever I run a build, Branch A gets merged into Branch B. I want to be able to email out all the updates made in A, since the last time the build was ran.  How can I use `git log` to be able to copy all the commits made in A since the last A -&gt; B merge?

Content Type	Original Author	Original Content on Stackoverflow
Question	callumacrae	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	Vaibhav	View Answer on Stackoverflow
Solution 3 - Git	Beat Scherrer	View Answer on Stackoverflow

Merging without whitespace conflicts

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

How do I simply create a patch from my latest git commit?

What does #defining WIN32_LEAN_AND_MEAN exclude exactly?

Attributions