### If you have pushed the commits upstream...
Select the commit you would like to roll back to and reverse the changes by clicking `Reverse File`, `Reverse Hunk` or `Reverse Selected Lines`. Do this for all the commits after the commit you would like to roll back to also.

![reverse stuff][1]
![reverse commit][2]

### If you have not pushed the commits upstream...
Right click on the commit and click on `Reset current branch to this commit`.

![reset branch to commit][3]


  [1]: http://i.stack.imgur.com/d6ukR.png
  [2]: http://i.stack.imgur.com/0UZrC.jpg
  [3]: http://i.stack.imgur.com/3DIk7.jpg

I searched for multiple options to get my git reset to specific commit, but most of them aren&#39;t so satisfactory.

I generally use this to reset the git to the specific commit in source tree.

 1. select commit to reset on sourcetree.

 2. In dropdowns select the active branch , first Parent Only

 3. And right click on &quot;Reset branch to this commit&quot; and select hard reset option (soft, mixed and hard)

 4. and then go to terminal git push -f

You should be all set!


There are two options to revert one commit our merged branch.
 
**A. Using sourcetree** 

 - Right click in commit
 - Select reverse commit
 - Sometimes, it can be failed. In that case, please try option B.

**B. Using terminal**

 - Select your commit and look info on bottom side of screen. Example commit id: *1a6cd9879d8c7d98cdcd9da9cac8979dac7a89c*

 - Click top right corner &quot;*Terminal*&quot; option of Sourcetree.
 - Write in terminal: *git revert your_commit_id -m 1*

 - When the commit message editor opens up: 
    - For just accept and exit, write **:q** then click enter.
    - If you want to change the commit message, press &quot;**i**&quot;, write your message and then write **:wq** click enter.


  [1]: https://i.stack.imgur.com/VzGZg.png

what is the difference between curly brace and square bracket in python?

    A ={1,2}
    B =[1,2]

when I print `A` and `B` on my terminal, they made no difference. Is it real?

And sometimes, I noticed some code use `{}` and `[]` to initialize different variables. 

E.g. `A=[]`, `B={}`

Is there any difference there?



What is the difference between curly brace and square bracket in Python?

In the new XCode 5.1, arm64 has become among the standard architectures to build for. 

However, in current projects of mine I included libraries (Google AdMob for example) that do not yet support this new architecture - these are now causing linker errors:

    ld: symbol(s) not found for architecture arm64

Google AdMob 6.8.0 for example is [said to be supporting arm64][1] but I can&#39;t really confirm this, unless `cputype (16777228) cpusubtype (0)` is arm64? (found through the file command-line tool)
   
    libGoogleAdMobAds.a: Mach-O universal binary with 5 architectures
    libGoogleAdMobAds.a (for architecture armv7):	current ar archive random library
    libGoogleAdMobAds.a (for architecture armv7s):	current ar archive random library
    libGoogleAdMobAds.a (for architecture i386):	current ar archive random library
    libGoogleAdMobAds.a (for architecture x86_64):	current ar archive random library
    libGoogleAdMobAds.a (for architecture cputype (16777228) cpusubtype (0)):	current ar archive random library

Is there a way to go about this? 

  [1]: http://googleadsdeveloper.blogspot.com/2013/11/new-google-mobile-ads-sdk-for-ios.html

Arm64 architecture in xcode 5.1

Recently in a project with multiple people, a commit was made as seen in the image below. Marked in red you can see a commit with the description/comment of &#39;Merge?&#39;.

This commit added numerous files and altered numerous others and was never intended to take place.

Using [tag:atlassian-sourcetree] what do I need to do to roll everything back to the commit highlighted in blue? (I am 8 commits behind as seen in the screenshot.)

![sourcetree troubs][1]


  [1]: http://i.stack.imgur.com/wmoTF.png

How to rollback everything to previous commit

Recently in a project with multiple people, a commit was made as seen in the image below. Marked in red you can see a commit with the description/comment of 'Merge?'.
This commit added numerous files and altered numerous others and was never intended to take place.
Using [tag:atlassian-sourcetree] what do I need to do to roll everything back to the commit highlighted in blue? (I am 8 commits behind as seen in the screenshot.)
<img src="http://i.stack.imgur.com/wmoTF.png" alt="sourcetree troubs">

I tried something like this:

    git branch temp

to create a new branch but *don&#39;t* move the `HEAD`. But I get:

    # Not currently on any branch.

I don&#39;t want to merge anything, I just want a new branch at the current `HEAD`.

Git create branch where detached HEAD is

I am trying to remove the file from my working directory but after using the following command 

    git checkout file_Name.txt

I got the following error message

    error: path &#39;first_Name.txt&#39; is unmerged


What is that and how to resolve it?

Following is my git status 

    $ git status
    On branch master
    You are currently reverting commit f200bf5.
      (fix conflicts and run &quot;git revert --continue&quot;)
      (use &quot;git revert --abort&quot; to cancel the revert operation)
    
    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:      first_file.txt
    
    Untracked files:
      (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)
    
            explore_california/
    
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)



Cannot checkout, file is unmerged

*This question is similar to [this one][1], but more specific.*

I have a project with two branches: `staging` and `beta`. 
I develop on `staging`, and use the `master` branch to fix bugs. So if I&#39;m working on staging and I see an error, I change to `master` branch:

    git checkout master

and do the stuff:

    git add fileToAdd
    git commit -m &quot;bug fixed&quot;

and then I merge with both branches:

    git checkout staging
    git merge master
    git checkout beta
    git merge beta

And doesn&#39;t matter if there are other files on the working tree.

But now, **when I try to change to the `master` branch, I&#39;m getting an error**:

    error: Your local changes to the following files would be overwritten by checkout:
	src/Pro/ConvocationBundle/Controller/DefaultController.php
    Please, commit your changes or stash them before you can switch branches.
    Aborting
 
I thought that I should remove the file from the staging area:

    git reset HEAD src/Pro/ConvocationBundle/Controller/DefaultController.php

But I&#39;m getting the same error. If I do `git status`, I get `No changes to commit`

    


  [1]: https://stackoverflow.com/questions/14318234/how-to-ignore-error-on-git-pull-about-my-local-changes-would-be-overwritten-by-m

error: Your local changes to the following files would be overwritten by checkout

A well meaning colleague has pushed changes to the Master instead of making a branch.  This means that when I try to commit I get the error: 

&gt; Updates were rejected because the tip of your current branch is behind

I know this should be resolved by making a pull request to re-sync things but I don&#39;t want to lose the changes I have made locally and I equally don&#39;t want to force the commit and wipe out the changes made by someone else.

What is the correct approach to allow me to merge the changes without losing either?


How to resolve git error: &quot;Updates were rejected because the tip of your current branch is behind&quot;

I made quite few changes in my project (I was working on a remote branch and not the master), I committed them and created a pull request on BitBucket and merged the branch to master. I had forgotten to push my changes after the commit. Now, after trying switching the current branch to my remote branch and reverting to the commit before the merge, I managed to get all my changes back and back them up elsewhere in my system. What I want to do now is undo the bad merge that I did. Each time I click on the merge and select &quot;Reverse commit&quot;, I get the following error message:

&gt; &quot;error: Commit &lt;commit_id&gt; is a merge but no -m option was given.
    
&gt; fatal: revert failed&quot;

The branches look like this now:

![enter image description here][1]

I want to remove the merge and bring it to a state such that it doesn&#39;t say `master(4 behind)` anymore.


  [1]: http://i.stack.imgur.com/bJ2eK.png

Removing/undoing a merge on Sourcetree

I need the last commit date in git. This means the latest update date in my program.

I used the command : $ `git log -1` but this command will give me the date from the local repository.  Rather I need date from remote repository. 

I tried some commands as follow.

    git log -n 1 origin/Sprint-6.
    git rev-parse --verify HEAD


How do I get last commit date from git repository?

I used git for the first time and I set my user name and user mail. The commands I used are below:

    git config --global user.email &quot;bob@example.com&quot;
    git config user.email &quot;bob@example.com&quot;
    git config --global user.name &quot;bob&quot;
    git config user.name &quot;bob&quot;

When I run `git commit --author &quot;bob&quot;` , I got an error `fatal: No existing author found with &#39;bob&#39;`. How can I set user name and email?

fatal: No existing author found with &#39;XXX&#39;

I am having some issues with Git.

I have a repository where I can commit any file to without problem. However, there is a single file &#39;Funder.php&#39; which, when I try committing, tells me there is an error  as:

    Commit failed with error:
    pathspec &#39;application/libraries/Funder.php&#39; did not match any file(s) known to git.

I am quite new to this, so was wondering if anybody could please help?

Why am I getting &quot;Commit failed with error: pathspec ... did not match any file(s)&quot;?

How are the Git commit IDs generated to uniquely identify the commits?

Example: `521747298a3790fde1710f3aa2d03b55020575aa`

How does it work? Are they only unique for each project? Or for the Git repositories globally?




What is a Git commit ID?

I&#39;m using visual studio 2013, and I&#39;m faced with 3 options for when I commit my C# code. I need an explanation of the differences between each of the options with regards to what happens to my local repo vs. the GitHub repo. 

 - Option 1 says Commit
 - Option 2 says Commit and Push
 - Option 3 says Commit and Sync

I don&#39;t quite understand the difference between the last 2 options. When should I use Commit and Sync as opposed to Commit and Push?


Differences between Commit, Commit and Push, Commit and Sync

I currently work on a project in which SVN is used as a repository. Locally, I do several &quot;experiments&quot; with the code that I don&#39;t want to commit to the repo. Therefore I use git locally on top of the SVN working directory and use multiple branches for different &quot;experiments&quot;. So it looks e.g. like this.

    C0 ---- C7 (master)
     \
      \---- C1 ---- C2 ---- C4 (exp1)
       \     \       \
        \     \       \---- C3 (exp2)
         \     \
          \     \---- C5 (exp3)
           \
            \---- C6 (exp4)

On branch ``master `` I want to have the untainted SVN repo, i.e. C0 is SVN Repo Revision x and C7 is SVN Repo Revision x + n.

Is it somehow easily possible to rebase all the ``exp`` branches onto C7 at once in such a way that the tree will look like the following diagram?

    C0 ---- C7 (master)
             \
              \---- C1&#39; ---- C2&#39; ---- C4&#39; (exp1)
               \     \         \
                \     \         \---- C3&#39; (exp2)
                 \     \
                  \     \---- C5&#39; (exp3)
                   \
                    \---- C6&#39; (exp4)

I want to use rebase since I don&#39;t want to modify the state of my local SVN Checkout and want to have my changes built on top of the SVN revisions.

I&#39;m also interested in solutions that work from within SourceTree without having to use the shell.

How can I rebase multiple branches at once?

I am using Sourcetree for Windows for a git-repository and would like to undo an unpushed commit.

Is that possible? If I do &quot;revert commit&quot;, it creates a second commit which reverts the first commit, but I don&#39;t want the first commit to appear at all in my source control.

I could also delete my local repository and pull it again without my local commit, but maybe there&#39;s another way?

Sourcetree - undo unpushed commits

In my team we are migrating from svn to git and we have agreed upon embracing the git-flow flow. I&#39;ve been playing around a while with SourceTree and the Git-Flow extension. Now, we have decided that the develop branch will be called development/current instead, but I do not find in the SourceTree UI where to change the Git-Flow configuration.

Is it possible, once initialized, to change the Git-Flow configuration for a given repository?

How to reset the git-flow configuration in SourceTree?

I&#39;m using [SourceTree](http://www.sourcetreeapp.com/) as my git tool on Windows.

I have a *main* branch and a *feature* branch and I can&#39;t get SourceTree to perform a rebase when I have a conflict.

*main* looks like:
&gt;c1 -&gt; c2 -&gt; c4 -&gt; c5

*feature* looks like:
&gt;c1-&gt; c2 -&gt; c3

I want to rebase *feature* so it will be:
&gt;c1 -&gt; c2-&gt; c4-&gt; c5-&gt; c3

There is a conflict between *c3* and *c5*.  I can resolve the conflict, but when I commit the changes I get a *HEAD* tag and looking at my graph I can see that *feature* branch wasn&#39;t rebased.  

How can I get the rebase to work?




Content Type	Original Author	Original Content on Stackoverflow
Question	captainrad	View Question on Stackoverflow
Solution 1 - Git	0xcaff	View Answer on Stackoverflow
Solution 2 - Git	Sidd Thota	View Answer on Stackoverflow
Solution 3 - Git	Rui Meneses	View Answer on Stackoverflow

How to rollback everything to previous commit

Git Problem Overview

Git Solutions

Solution 1 - Git

If you have pushed the commits upstream...

If you have not pushed the commits upstream...

Solution 2 - Git

Solution 3 - Git

Arm64 architecture in xcode 5.1

What is the difference between curly brace and square bracket in Python?

Attributions