What you want is `git rerere` which records conflict resolutions for you. The best introduction to this I have seen is now part of the [Git Book, Tools chapter][1]. In practice when you perform a rebase, you will end up stopping as before but you only have to check the merge conflict remains resolved then `git add` it and continue.


  [1]: https://git-scm.com/book/en/v2/Git-Tools-Rerere

You should not be getting the same conflict over and over. **Rerere will not help you here.** It simply means that the codebase that you are trying to replay commits over is so different that each commit needs your help to adjust it. This is one of the reasons to favour merge over rebase. In my opinion, rebase should be used only if necessary and not part of your regular workflow. Rerere will help a lot more in a merge/reset type workflow. Here is my workflow that avoids rebasing:  http://dymitruk.com/blog/2012/02/05/branch-per-feature/

One way to ease some of the pain is to use a smart merging program like Beyond Compare. It is syntax aware and will solve quite a few conflicts that Git will (rightfully) refuse to do for you. Many times, these tools, when invoked, won&#39;t even open their UI, solve the issue and allow your `git mergetool` command to continue on to the next conflict. Remember to set &quot;trust mergetool exit code&quot; to true.

I am using prelude as a base Emacs configuration.
I have installed lots of packages from the package manager, and I want to use my settings on another machine. 

I don&#39;t want to carry the installed packages and also I don&#39;t want to create a list manually.

What is the way of saving a list all the installed packages into prelude-package.el or any other file so that when I take this configuration to my other machine, they automatically get installed there on first use?

How to save a list of all the installed packages in Emacs 24?

I need to create ipa file for testing purposes.
I go to Keychian access -&gt; Certificate assistant -&gt; Request a certificate from a certificate authority and create some.certSigningRequest file.
Then I upload that file to customer iOS Provisioning Portal and create development and distribution certificate which I download and install on my vmware mac.
When I select certificate i got message: **this certificate was signed by an unknown authority** &lt;br&gt;
Here is the image:&lt;br&gt;&lt;br&gt;
![enter image description here][1]

I am confused and don&#39;t know what can be wrong?

Any help is greatly appreciate.
Thanks people...


  [1]: http://i.stack.imgur.com/OogdL.png

this certificate was signed by an unknown authority

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?

<p>When I do <code>git rebase branch1</code> in my <code>branch1-local</code> I get conflicts. I solve the conflict, do <code>git add &#x3C;conflicted-add></code> and then do <code>git rebase --continue</code> 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, <code>git add</code>, the <code>git rebase --continue</code>, and then it all repeats again until I repeat this for each commit being rebased on.</p>
<p>Why rebase is having me redo the same conflict resolution over and over again?</p>


Is there a way to setup the host Git repository such that any `git pull` done from its (local) clones uses `--rebase` by default? By searching on Stack&amp;nbsp;Overflow, I learned about `branch.autosetuprebase`, but it needs to be configured per clone individually. 

My project flow is set up such that we `pull` the `develop` branch before `merge`ing a feature branch to it. This `pull` nearly always uses `--rebase`, so I am trying to figure out if this can be the default. 

  [1]: https://stackoverflow.com/users/1248008/jonas-wielicki


How to make Git pull use rebase by default for all my repositories?

Say I have two branches - `master` and `redesign`.  How would I go about overwriting the file `default.aspx.cs` in my redesign branch with the one from master?

I found [this question][1] but it seems to go over how to revert a file back to it&#39;s previous version in the same branch.  I also considered using a `merge`, but I don&#39;t want to merge, I want to overwrite.  Suggestions?


  [1]: https://stackoverflow.com/questions/692246/how-do-i-revert-one-file-to-the-last-commit-in-git

Overwrite single file in my current branch with the same file in the main branch?

I know that, if I wanted to grep for a pattern only on files with certain extensions, I could do this:

    // searches recursively and matches case insensitively in only javascript files
    // for &quot;res&quot; from the current directory
    grep -iIr --include=*.js res ./

I&#39;ve been trying to search for a way to do this via git grep as well (to take advantage of git grep&#39;s speed from the indexes it stores with its tree), but to no avail. I saw [here][1] that excluding certain file types is not possible.


  [1]: http://git.661346.n2.nabble.com/git-grep-while-excluding-files-in-a-blacklist-td7195648.html

git grep by file extensions

Is it possible to commit and push changes from one branch to another.

Assume I commited changes in **BRANCH1** and want to push them to **BRANCH2**.

From **BRANCH1**, is it valid to do:

    git push origin **BRANCH2**

And then reset BRANCH1?

Push commits to another branch

I am trying to access a branch&#39;s commit history on a remote repository. I had a look at [the doc][1] but could not find any substantial information on how to access a remote repo&#39;s commit history using my local git client.  


  [1]: http://git-scm.com/book/en/Git-Basics-Viewing-the-Commit-History

Commit history on remote repository

I&#39;m trying to rebase &#39;dev&#39; to catch up to &#39;master&#39; branch. 

    $ git checkout dev 
    $ git rebase master 
    First, rewinding head to replay your work on top of it...
    Applying: Corrected compilation problems that came from conversion from SVN.
    Using index info to reconstruct a base tree...
    M       src/com/....
    &lt;stdin&gt;:125: trailing whitespace.
    /**
    &lt;stdin&gt;:126: trailing whitespace.
     *
    &lt;stdin&gt;:127: trailing whitespace.
     */
    &lt;stdin&gt;:128: trailing whitespace.
    package com....
    &lt;stdin&gt;:129: trailing whitespace.
    
    warning: squelched 117 whitespace errors
    warning: 122 lines add whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging src/com/....
    CONFLICT (content): Merge conflict in src/com/...
    Failed to merge in the changes.
    Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.
    
    $ vi src/com/.....   { fixed the merge issue on one file } 
    $ git add -A . 
    $ git rebase --continue 
    src/com/....: needs merge
    You must edit all merge conflicts and then
    mark them as resolved using git add
    $ vi src/com....      { verified, no &gt;&gt;&gt; or &lt;&lt;&lt; left, no merge markers } 
    $ git rebase --continue 
    Applying: Corrected compilation problems that came from conversion from SVN.
    No changes - did you forget to use &#39;git add&#39;?
    If there is nothing left to stage, chances are that something else
    already introduced the same changes; you might want to skip this patch.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.

Any ideas?

Git rebase merge conflict cannot continue

I have two (private) feature branches that I&#39;m working on.

    a -- b -- c                  &lt;-- Master
         \     \
          \     d -- e           &lt;-- Branch1
           \
            f -- g               &lt;-- Branch2

After working on these branches a little while I&#39;ve discovered that I need the changes from Branch2 in Branch1. I&#39;d like to rebase the changes in Branch2 onto Branch1. I&#39;d like to end up with the following:

    a -- b -- c                  &lt;-- Master
               \
                d -- e -- f -- g &lt;-- Branch1
 
I&#39;m pretty sure I need to rebase the second branch _onto_ the first, but I&#39;m not entirely sure about the correct syntax and which branch I should have checked out.

Will this command produce the desired result?

    (Branch1)$ git rebase --onto Branch1 Branch2

        
 

Rebase feature branch onto another feature branch

We use git and have a master branch and developer branches. I need to add a new feature and then rebase the commits to master, then push master to CI server.

The problem is that if I have conflicts during rebase I cannot push to my remote developer branch (on Github) after the rebase is complete, until I pull my remote branch. This causes duplicate commits. When there are no conflicts, works as expected.

question: after rebase and conflict resolution, how do I sync up my local and remote developer branches without creating duplicate commits

Setup:

    // master branch is the main branch
    git checkout master
    git checkout -b myNewFeature
    
    // I will work on this at work and at home
    git push origin myNewFeature
    
    // work work work on myNewFeature
    // master branch has been updated and will conflict with myNewFeature
    git pull --rebase origin master
    
    // we have conflicts
    // solve conflict
    git rebase --continue
    
    //repeat until rebase is complete
    git push origin myNewFeature

    //ERROR
    error: failed to push some refs to &#39;git@github.com:ariklevy/dropLocker.git&#39;
    hint: Updates were rejected because the tip of your current branch is behind
    hint: its remote counterpart. Merge the remote changes (e.g. &#39;git pull&#39;)
    hint: before pushing again.
    hint: See the &#39;Note about fast-forwards&#39; in &#39;git push --help&#39; for details.

    // do what git says and pull
    git pull origin myNewFeature
    
    git push origin myNewFeature

    // Now I have duplicate commits on the remote branch myNewFeature

##EDIT##
**So it sounds like this will break the workflow:**

developer1 working on myNewFeature
developer2 working on hisNewFeature
both use master as main branch

developer2 merges myNewFeature into hisNewFeature

developer1 rebases, resolves conflicts, then force pushes to remote branch for myNewFeature

a couple days later, developer2, merges myNewFeature into hisNewFeature again

Will this cause the other developers to hate developer1?






can&#39;t push to branch after rebase

Is there a difference between `git rebase upstream/master` and `git pull --rebase upstream master`, and if so, what? The remote could be any remote, not necessarily upstream.

git rebase upstream/master vs git pull --rebase upstream master

Git&#39;s [documentation for the `rebase` command][1] is quite brief:

    --preserve-merges
        Instead of ignoring merges, try to recreate them.

    This uses the --interactive machinery internally, but combining it
    with the --interactive option explicitly is generally not a good idea
    unless you know what you are doing (see BUGS below).

So what actually happens when you use `--preserve-merges`? How does it differ from the default behavior (without that flag)? What does it mean to &quot;recreate&quot; a merge, etc.


  [1]: https://git-scm.com/docs/git-rebase

What exactly does git&#39;s &quot;rebase --preserve-merges&quot; do (and why?)

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.

Choose Git merge strategy for specific files (&quot;ours&quot;, &quot;mine&quot;, &quot;theirs&quot;)

I&#39;m trying to script rebasing and my script will take different paths depending on if the rebase results in any conflicts.

Is there a way to determine if a rebase would result in conflicts before executing the rebase?

Is there some kind of &#39;git rebase --dry-run&#39;, which would notify me of conflicts in advance?

git sometimes gives me this message on a conflict (during a revert or cherry pick)

    hint: after resolving the conflicts, mark the corrected paths

What does this mean?

hint: after resolving the conflicts, mark the corrected paths

After pushing I&#39;ve been seeing this message at remote repository:

&gt; 1 commit behind master. 
&gt;
&gt;  This merge has conflicts that must be resolved before it can be committed. 
&gt;
&gt; To manually merge these changes into TA20footerLast run the following commands:
&gt;
&gt; `git checkout 7c891f50c557`
&gt;
&gt; **Note**: This will create a detached head!
&gt;
&gt; `git merge remotes/origin/master`

Content Type	Original Author	Original Content on Stackoverflow
Question	lurscher	View Question on Stackoverflow
Solution 1 - Git	patthoyts	View Answer on Stackoverflow
Solution 2 - Git	Adam Dymitruk	View Answer on Stackoverflow

Why do I have to resolve the same "git rebase" conflict over and over?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

this certificate was signed by an unknown authority

How to save a list of all the installed packages in Emacs 24?

Attributions