Unfortunately the UX path for the resolving conflicts during a rebase is quite poor in [tag:atlassian-sourcetree].  

After you have resolved the conflict and have all of your changes in the staging area, instead of clicking *commit*, go to *Actions*-&gt; *Continue Rebase*:

![enter image description here][1]


  [1]: http://i.stack.imgur.com/1N2JB.png

&gt; After you have resolved the conflict and have all of your changes in
&gt; the staging area, instead of clicking commit, go to Actions-&gt; Continue
&gt; Rebase:

In the latest version of source tree, after you have resolved the conflict and have all of your changes in the staging area, you have to commit first and then click on *Actions -&gt; Continue Rebase*.

I had this problem for a while and was able to solve it myself.

If in opening your project in Android Studio and something similar to this error message pops up:

    Cannot load settings from file (C:\Users\User\AndroidStudioProjects\ProjectName\.idea\workspace.xml): Error on line 1: Content is not allowed in prolog. Please correct the file content.

Fix Android Studio Corrupted Project Workspace Settings

I have implemented deep linking in my app. I added this intent filter in my manifest file, and the deep linking is working.

	&lt;intent-filter&gt;
		&lt;action android:name=&quot;android.intent.action.VIEW&quot; /&gt; 
		&lt;category android:name=&quot;android.intent.category.DEFAULT&quot; /&gt; 
		&lt;category android:name=&quot;android.intent.category.BROWSABLE&quot; /&gt; 
		&lt;category android:name=&quot;android.intent.category.VIEW&quot; /&gt; 
		&lt;data
			android:host=&quot;www.mywebsite.com&quot;
			android:pathPrefix=&quot;/something&quot;
			android:scheme=&quot;http&quot; /&gt;
	&lt;/intent-filter&gt;

The problem is that through deep linking, my app is launching on top of current app. If I am in Gmail and I click a link, then my app is launching on top of Gmail. I want to launch my app differently.

If my app is already running in background and I click on a link in Gmail which redirects to my app, I will have two instances of my app running at the same time; one in the background, and another on top of Gmail. I want to run only one instance of my app at a time, so it&#39;s not also on top of the current app (Gmail). How can I do that?

Deep linking and multiple app instances

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?




Using Source Tree, rebase with conflict, rebase doesn&#39;t work after conflict resovled

I'm using <a href="http://www.sourcetreeapp.com/" target="_blank" rel="noopener noreferrer">SourceTree</a> as my git tool on Windows.
I have a main branch and a feature branch and I can't get SourceTree to perform a rebase when I have a conflict.
main looks like:
>c1 -> c2 -> c4 -> c5
feature looks like:
>c1-> c2 -> c3
I want to rebase feature so it will be:
>c1 -> c2-> c4-> c5-> 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't rebased.
How can I get the rebase to work?

I am using TortoiseGit on Windows. When I am trying to Clone from the context menu of the standard Windows Explorer, I get this error:

&gt; Please make sure you have the correct access rights and the repository exists

More precisely, the snapshot of terminal is the following:

&gt; git.exe clone  --progress -v  &quot;git@arobotdev:\git\AlfaRobot.git&quot; &quot;C:\Work\AlfaRobot&quot;&lt;br&gt;
&lt;br&gt;
Cloning into &#39;C:\Work\AlfaRobot&#39;...&lt;br&gt;
Permission denied, please try again.&lt;br&gt;
Permission denied, please try again.&lt;br&gt;
Permission denied (publickey,password).&lt;br&gt;
fatal: Could not read from remote repository.&lt;br&gt;
&lt;br&gt;
Please make sure you have the correct access rights&lt;br&gt;
and the repository exists.&lt;br&gt;
&lt;br&gt;
git did not exit cleanly (exit code 128) (21450 ms @ 19.09.2014 10:36:58)

What should I do to make git work properly ?

Git error: &quot;Please make sure you have the correct access rights and the repository exists&quot;

I have a stash with an incorrect name. I would like to fix the name so it&#39;s accurate. 

**How can I rename a stash?**

How can I rename a git stash?

    git clone &lt;url&gt;

gives the message fatal: repository &#39;url&#39; not found

I tried the options in the [link](https://help.github.com/articles/error-repository-not-found), but it didn&#39;t work. 



Git Clone - Repository not found

I might not have the terminology down yet. I made file to be added to a open project on git. I forked the project. I made some changes and my last commit is the file I want to request to the project and not the small changes I made before hand. When I go to github site and make pull request I get all the commits before the one I want which is last one of a file and I don&#39;t&#39; want to submit all of the other commits because I don&#39;t think its necessary for the project. Just my own changes. What do I do? Should I just make another res or attach the file singularly and submit, if that&#39;s possible.

Git - Cherry pick a single commit for pull request

In Atlassian SourceTree, how to know which tags are only local and which are also in remote?

When creating a tag you get the option &quot;Push tag to: ...&quot;, but how to know if a tag has been pushed or not after it is created? I can see all my tags locally, but I need to be sure that they are present in remote so that other developers can pull them.

How to see remote tags?

I&#39;m the administrator of the GitHub repository [https://github.com/plison/opendial][1]. I would like to reduce the number of commits on the repository, since the repository already has a few thousand commits, many of whom are minor debugging changes that could easily be squashed together (especially the ones that are a few years old).

I&#39;m therefore trying to apply rebasing in order to squash together part of my commits. However, I&#39;ve experience the following issue:

 1. When I type e.g. `git rebase -i HEAD~10`, I get a quite long number of commit lines (much more than 10) in the interactive editor. What could be the reason?
 2. More importantly, once I close the interactive editor to start the rebasing, I systematically get the error message &quot;error:could not apply &lt;some commit ID&gt;&#39;, **even when I do not make any change to the commits** (i.e. if I leave all lines as &#39;pick&#39;, without any modification or reordering).

How can I solve these issues? It should be noted that the repository was automatically imported from a previous (SVN) repository hosted on Google Code. The conversion seemed so far to have worked well, but I&#39;m wondering why I get these errors when trying to rebase my commits.

  [1]: https://github.com/plison/opendial

Error with git rebase (&quot;could not apply...&quot;)

So my history looks like this:

```
o---o---o---o  master
     \
      o---o---o  A
               \
                o B
```

So, to explain:

- I have branch `A` which was started from `master`
- I have branch `B` (with only 1 commit) which was started from `A`

What I want is this:

```
o---o---o---o  master
             \
              o---o---o  A
                       \
                        o B
```

---

What I did was:

1).

```
git checkout A
git rebase master
```

This resulted in a lot of conflicts which, after some significant time spent fixing, the following history emerged:

```
o---o---o---o  master
             \
              o---o---o  A
```

Which is exactly what I wanted.

(I don&#39;t know where `B` is right now)

---

2).

After this I did a lot of squashes and changed the order of commits on `A`, to make the history look like I want.

---

3).

Now, what I also want to do is:

```
git checkout B
git rebase A
```

However this doesn&#39;t seem to work and I don&#39;t know why. If I do `git log` I see the commits which were there before I did step 1.

Also, I get the same huge number of conflicts which I already solved at step 1. I spent significant time doing it, don&#39;t want to do it again.

[This example](https://stackoverflow.com/questions/27445747/how-to-rebase-over-already-rebased-branch) suggested to use `--onto`, which I did:

```
git checkout B
git rebase --onto A
```

But this deletes the commit on `B` entirely and makes `A` and `B` point to the same commit i.e. the last one on `A`.

---

My question is: **How can I effectively rebase B off A so that it looks like B started from A** ? (which was actually true in the beginning).

My best guess is that I&#39;m using `--onto` wrong. Or that I should use something else (like `cherry-pick`).

How to rebase a branch off a rebased branch?

During `git rebase origin/development` the following error message is shown from Git:

    fatal: refusing to merge unrelated histories
    Error redoing merge 1234deadbeef1234deadbeef

My Git version is 2.9.0. It used to work fine in the previous version. 

How can I continue this rebase allowing unrelated histories with the forced flag introduced in the new release?


Git refusing to merge unrelated histories on rebase

I have the following in the to-do text of `git rebase -i HEAD~2`:


    pick 56bcce7 Closes #2774
    pick e43ceba Lint.py: Replace deprecated link
    
    # Rebase 684f917..e43ceba onto 684f917 (2 command(s))
    #
    ...


Now, when I try to squash the first one(`56bcce7`) and pick the second one by adding &quot;s&quot; before the first, I get the following error:

    Cannot &#39;squash&#39; without a previous commit

Can someone explain me what it means, and how do I do it?

**I want to squash the first commit(`56bcce7`) and &quot;select and reword&quot; the second(`e43ceba`) commit**

Git: &quot;Cannot &#39;squash&#39; without a previous commit&quot; error while rebase

In my git repo, I have a `Master` branch. One of the remote devs created a branch `Branch1` and had a bunch of commits on it. I branched from `Branch1`, creating a new branch called `Branch2` (`git checkout -b Branch2 Branch1`) such that `Branch2` head was on the last commit added to `Branch1`:(Looks like this)

    Master---
             \
              Branch1--commit1--commit2
                                       \
                                        Branch2 (my local branch) 

`Branch1` has had a number of changes. The other dev squashed his commits and then added a few more commits. Meanwhile, ive had a bunch of changes in my branch but havent committed anything yet. Current structure looks like this:

 

      Master---
                 \
                 Branch1--squashed commit1,2--commit3--commit4
                                           \
                                            Branch2 (my local branch)

Now I want have to rebase my changes on top of `Branch1`. I am supremely confused on how to go about this. I know the 1st step will be to commit my changes using `git add .` and `git commit -m &quot;message&quot;`. But do i then push? using `git push origin Branch2` ? or `git push origin Branch2 Branch1` ? Help is much needed and GREATLY appreciated, also if I can some how create a backup of my branch, it will be great in case I screw something up

Git rebase one branch on top of another branch

I worked on github and integrated it to sourcetree (MAC version) for one of my project. I would like to use sourcetree for GITLAB. But I am not able to add remote of gitlab to source tree. In Repository settings, Only I can see host type as &quot;unknown&quot;, &quot;bitbucket&quot;, &quot;github&quot; &amp; &quot;stash&quot;. I used unknown but it won&#39;t help me.

Sourcetree Version 2.0.4 (2.0.4)

![enter image description here][1]


  [1]: https://i.stack.imgur.com/AkzBB.png

How to integrate sourcetree for gitlab

I work on a lot of small projects on daily basis and need to switch often.

 - I have over 50 Git Repositories in Sourcetree.
 - Usually 5 projects are open in &quot;Tabs&quot;.

Switching from &quot;Tab&quot; in SourceTree is very slow. Sometimes up to 15 seconds. How can I improve this behaviour?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/Nga4K.png

SourceTree very slow with many repositories

Is it possible to change the commit date from my commit to the author date?

I adapted some commits and now the dates are all the same. I want to set it back to the old dates (or the author dates). Is this possible?

I am using Sourcetree so I have the git command line but I am not a pro at that. My external repository is bitbucket.

GIT: change commit date to author date

Does Sourcetree offer a way to visualize differences between `git` branches?

I&#39;m looking for:

- names of files that have changed
- diffs between these files

Is there a way to get a visual diff on two branches in SourceTree?

When I try to pull in my project directory in the terminal, I see the following error:

    harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master
    U app/config/app.php
    U app/config/database.php
    U app/routes.php
    Pull is not possible because you have unmerged files.
    Please, fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39;
    as appropriate to mark resolution, or use &#39;git commit -a&#39;.

Why does git say `&quot;Pull is not possible because you have unmerged files&quot;`, and how can I resolve it?

Why does git say &quot;Pull is not possible because you have unmerged files&quot;?

I&#39;ve created pull request I got into this:

[![enter image description here][1]][1]

&quot;Approve&quot; button does nothing and complete is disabled.

How do I resolve this confligt in pull request?

  [1]: https://i.stack.imgur.com/7KKqE.png

Content Type	Original Author	Original Content on Stackoverflow
Question	user4007604	View Question on Stackoverflow
Solution 1 - Git	Philip Pittle	View Answer on Stackoverflow
Solution 2 - Git	pro_gamer	View Answer on Stackoverflow

Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Deep linking and multiple app instances

Fix Android Studio Corrupted Project Workspace Settings

Attributions