`git fetch origin; git reset --hard origin/&lt;branch&gt;`

I have 3 branchs：main，feat-dev，func。（feat-dev from main，func from feat-dev）

I use these step:

1. on func, git rebase origin/feat-dev; git push --force;
2. on feat-dev, git rebase origin/main; git push --force;
3. on func, git rebase origin/feat-dev.
 
git tell me same messages: &quot;First, rewinding head to replay your work on top of it...&quot;

On func, I just use
```sh
git push --force
```
Then everything goes fine. 

The answer that I found on the web is to use `request.args.get`. However, I cannot manage it to work. I have the following simple example:


    from flask import Flask
    app = Flask(__name__)
    
    @app.route(&quot;/hello&quot;)
    def hello():
    	print request.args[&#39;x&#39;]
    	return &quot;Hello World!&quot;
    
    if __name__ == &quot;__main__&quot;:
    	app.run()

I go to the `127.0.0.1:5000/hello?x=2` in my browser and as a result I get:

    Internal Server Error
    
    The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application.

What am I doing wrong?

How to obtain values of parameters of get request in flask?

I&#39;ve been programming a lot in WPF lately but my View and ViewModel are not separate at this point. Well, it&#39;s partially. All my bindings concerned to text in text boxes, content for labels, lists in datagrids, ... are done by regular properties with a NotifyPropertyChanged event in them.

All my events for handling button clicks or text changed stuff is done by linking the events. Now, I wanted to start working with commands and found this article: http://www.codeproject.com/Articles/126249/MVVM-Pattern-in-WPF-A-Simple-Tutorial-for-Absolute. It has an explanation of how to set up MVVM but I&#39;m confused with the `RelayCommand`.

What job does it do?
Is it useable for all commands in my form?
How do I make the button disable when (a) certain text box(es) are not filled in?

---
EDIT 1:

A good explanation to &quot;Is it useable for all commands in my form?&quot; is answered here: https://stackoverflow.com/a/22286816/3357699

Here is the code I have so far: https://stackoverflow.com/a/22289358/3357699

Why RelayCommand

I am getting this message:

     First, rewinding head to replay your work on top of it...

each time I do a `git pull --rebase origin &lt;branch&gt;`, however I would like to discard all my work that may be replayed on top of it.. Basically I would like to rebase only the origin branch without my work on top of it.
How can I clean those commits that comes up wrongly all times I try to pull rebase?
Again, my goal is just pull rebase the exact snapshot of the origin branch without my work on top of it.
Thanks in advance.




Git: First rewinding head to replay

I am getting this message:
<pre><code class="hljs language-css"> First, rewinding head to replay your work on top of it...
</code></pre>
each time I do a <code>git pull --rebase origin &#x3C;branch></code>, however I would like to discard all my work that may be replayed on top of it.. Basically I would like to rebase only the origin branch without my work on top of it.
How can I clean those commits that comes up wrongly all times I try to pull rebase?
Again, my goal is just pull rebase the exact snapshot of the origin branch without my work on top of it.
Thanks in advance.

Would it be good practice to keep only the `bower.json` file and gitignore the whole `bower_components` directory?

Should bower_components be gitignored?

Someone please help me understand submodules in git. I know they are getting a lot of bashing around the internet but since I assume the git developers are smart people there must a reason for the current behavior - and maybe a way to work around my problem.

So, I have a project and some submodules. The project have different branches, like:

 * MyApp_version2
 * MyApp_version3
 * MyApp_version4
 * MyApp_liteversion
 * MyApp_development

My submodules doesn&#39;t update that often (maybe once a week) so I&#39;m fine with them [not being attached to the head of the submodule repository automatically](https://stackoverflow.com/questions/1979167/git-submodule-update).

However, when I check out an old branch - because I need to fix a bug in an old version of the software - I also need to update the submodules.

Why do I need to do this?

I would expect git to work like svn. When I commit my work in my main repo I would expect git to think something along these lines: &quot;OK, he wants to commit his work now. I can see the submodules are currently at revision abc so when he at some point in the future get&#39;s back to this commit he probably wants the submodules at the same revision again.&quot;

I can not see a single case where you would want the submodules to stay at the current revision while you go back 3 years in your main repository. However, there must be a reason for this implementation, right?

I would really like to hear if any of you know the thoughts behind this, but in any case I would really like a solution. Is there a way to tell git: &quot;I want to commit this work with these submodules. If I at some point go back to this state I want the submodules to be checked out at the correct version as well.&quot;


**Example for clarification**

My main repository is an application which needs to use SSL, and I find a SSL library (libSSL) I add as a submodule.

On Oct. 31 2010 I create a commit in my main repository (2fd4e1) while the submodule points to libSSL version 3 (c67a2d).

Time passes, libSSl gets updated to version 34, I adapt my code, life it good.

On May 14 2013 I create a new commit (28fced) and submodule points to the most recent version of libSSL (849ee1).

However, if I check out 2fd4e1 my submodule will stay at 849ee1 even though the original commit was created with c67a2d. Git knows I made the original commit with c67a2d and I don&#39;t see how you could possibly want a another submodule than the one the original commit was created with.

Why doesn&#39;t `git checkout` automatically do `git submodule update --recursive`?

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

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

I want to create a branch from an existing remote branch (let&#39;s say remote-A) and then commit the changes to the repository.

I have used the below commands to create a local branch from the existing remote-A

    $git checkout remote-A

    git branch
    master
    * remote-A

Now I have created local-B from Remote A using the below commands

    git branch local-B
    git checkout local-B

How do I make sure the changes I have on local-B are on top of remote-A so that when I push local-B to the remote repo, the changes are on top of remote-A?



How to create a local branch from an existing remote branch?

I am new to git. I have a very simple scenario for using git. I had my first release written with Android Studio. Now I want to work with some new features. What I did so far:

 1. enabled the VCS in my Android Studio 
 2. created a local repository for my project from Android Studio
 3. pushed my local repository to my Bitbucket remote repository (`$git push -u origin master`)

Now I am confused for the next step: create a feature branch. Should I create a branch in the local repository: 

    $ git branch --track feature1 origin/master 

or should I create a new branch from the Bitbucket web portal, and clone the new branch?

I also want to know how I can switch branches with Android Studio? For example, switch from feature branch to master branch to work on some hotfix. Do I need to use the Bitbucket plugin to checkout the project very time from the remote repository every time I switch branches or I can hot switch it inside Android Studio?

Thanks!

How to use git branch with Android Studio

I&#39;m using Visual Studio 2013&#39;s Git support to work on a private GitHub repository. I have permission to commit to it. I want to switch branches, but when I go to the Branches view, the only branch in any of the lists (branch drop-down, published branches, merge tool) is master. Other branches show up in GitHub, GitHub for Windows, and TortoiseGit. So I know they&#39;re there and I have access.

Any ideas why I can&#39;t see other branches in Visual Studio?

![enter image description here][1]

I&#39;m running Visual Studio 2013 Update 2.


  [1]: http://i.stack.imgur.com/zkWYt.png

Visual Studio 2013 git, only Master branch listed

I have in my git repo, a file named xyz. Coincidently, I also have a branch named xyz. Presently I am on master, but I want to checkout to branch xyz. The command to be used is simple

    $ git checkout xyz

But this would checkout the file `xyz` to the present HEAD. How would I change my branch to branch `xyz`?


Git change branch when file of same name is present

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&#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**

Content Type	Original Author	Original Content on Stackoverflow
Question	Rollerball	View Question on Stackoverflow
Solution 1 - Git	aragaer	View Answer on Stackoverflow
Solution 2 - Git	我要改名叫嘟嘟	View Answer on Stackoverflow

Git: First rewinding head to replay

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Why RelayCommand

How to obtain values of parameters of get request in flask?

Attributions