After the merge, it&#39;s safe to delete the branch:

    git branch -d branch1

Additionally, git will warn you (and refuse to delete the branch) if it thinks you didn&#39;t fully merge it yet. If you forcefully delete a branch (with `git branch -D`) which is not completely merged yet, you have to do some tricks to get the unmerged commits back though (see below).

There are some reasons to keep a branch around though. For example, if it&#39;s a feature branch, you may want to be able to do bugfixes on that feature still inside that branch.

If you also want to delete the branch on a remote host, you can do:

    git push origin :branch1

This will forcefully delete the branch on the remote (this will not affect already checked-out repositiories though and won&#39;t prevent anyone with push access to re-push/create it).

---

``git reflog`` shows the recently checked out revisions. Any branch you&#39;ve had checked out in the recent repository history will also show up there. Aside from that, ``git fsck`` will be the tool of choice at any case of commit-loss in git.

I prefer **RENAME** rather than **DELETE**  

All my branches are named in the form of 

 - `Fix/fix-&lt;somedescription&gt;` or  
 - `Ftr/ftr-&lt;somedescription&gt;` or 
 - etc.

 
Using Tower as my git front end, it neatly organizes all the `Ftr/`, `Fix/`, `Test/` etc. into folders.  
Once I am done with a branch, I **rename** them to `Done/...-&lt;description&gt;`.   

That way they are still there (which can be handy to provide history) and I can always go back knowing what it was (feature, fix, test, etc.)

If you DELETE the branch after merging it, just be aware that all hyperlinks, URLs, and references of your DELETED branch will be **BROKEN**.

I have a colleague who claims that `git pull` is harmful, and gets upset whenever someone uses it.

The `git pull` command seems to be the canonical way to update your local repository.  Does using `git pull` create problems? What problems does it create? Is there a better way to update a git repository?

In what cases could `git pull` be harmful?

How would you say does not equal?

Like 

    if hi == hi:
        print &quot;hi&quot;
    elif hi (does not equal) bye:
        print &quot;no hi&quot;

Is there something equivalent to `==` that means &quot;not equal&quot;?




Is there a &quot;not equal&quot; operator in Python?

I had two branches: `master` and `branch1`. I just merged `branch1` back into `master` and I&#39;m done with that branch. Should I delete it or just let it sit around? Will deleting it cause any loss of data?

What to do with branch after merge

<p>I had two branches: <code>master</code> and <code>branch1</code>. I just merged <code>branch1</code> back into <code>master</code> and I'm done with that branch. Should I delete it or just let it sit around? Will deleting it cause any loss of data?</p>


When doing `git log --decorate --oneline --graph` in one of our repositories shortly before Christmas, we found that the following structure had appeared (rotated to emphasize the tenuous festive theme):

![redacted git log output, rotated to look like a Christmas tree][1]

How did this pattern in the commit graph arise?

  [1]: http://i.stack.imgur.com/ZsXT6.png

*This is deliberately somewhat silly, of course, but there&#39;s a interesting point here — it&#39;s often difficult to see how to interpret particular patterns in the commit graph when you see them in you git history browser.*

Why does my git history look like a christmas tree?

Is there a shortcut to tell Git to push the current tracking branch to origin?
&lt;br/&gt;**Note:** I know that I can change the [default push behavior][1], but I am looking for an ad-hoc solution that does not change the default behavior. 


For example, suppose I am on branch `feature/123-sandbox-tests` I would be using

    git push origin feature/123-sandbox-tests
which is tedious. I am looking for a shortcut, something like

    git push origin current # &lt;- example, not working
where git knows that current is `feature/123-sandbox-tests`.


----------
**Edit**: Starting from version 2.0, git&#39;s **default** behavior has changed to a more intuitive behavior, which is what I wanted to achieve. See [This SO question][2] for details.  


**Edit 2**: [ceztko&#39;s answer][3] is the best answer as it allows to push the current branch, regardless of the settings.


  [1]: https://stackoverflow.com/a/948397/138585
  [2]: https://stackoverflow.com/questions/13148066/warning-push-default-is-unset-its-implicit-value-is-changing-in-git-2-0
  [3]: https://stackoverflow.com/a/20922141/138585

Git - push current branch shortcut

How do I delete a remote master branch from GitHub/Bitbucket?

I&#39;m trying:

    # git push bb --delete master
    remote: bb/acl: user is allowed. accepted payload.[K
    remote: error: refusing to delete the current branch: refs/heads/master[K
    To ssh://git@bitbucket.org/user/reponame.git
     ! [remote rejected] master (deletion of the current branch prohibited)
    error: failed to push some refs to &#39;ssh://git@bitbucket.org/user/reponame.git&#39; 

Also I tried

    git push bb :master

But all this does not work.


Deleting remote master branch, refused due to being the current branch

I&#39;m in the process of learning github on mac (command-line) and whenever I do `git pull origin master` i get this

    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with &#39;#&#39; will be ignored, and an empty message aborts
    # the commit.
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    ~                                                                               
    &quot;.git/MERGE_MSG&quot; 7L, 293C

the terminal seems to lock up  and doesn&#39;t allow me to enter anything immediately, then when it finally does allow me to enter text it seems like it doesn&#39;t recognize git commands.

Is this a bug in git or am i missing something?  

github locks up mac terminal when using pull command

I&#39;m trying to undo all changes since my last commit. I tried `git reset --hard` and `git reset --hard HEAD` after viewing [this post][1]. I responds with head is now at 18c3773... but when I look at my local source all the files are still there. What am I missing?


  [1]: https://stackoverflow.com/questions/7999259/git-how-to-perform-the-tfs-equivalent-of-undo-pending-changes

git undo all uncommitted or unsaved changes

&gt; **Possible Duplicate:**  
&gt; [Merge multiple data frames in a list simultaneously](https://stackoverflow.com/questions/8091303/merge-multiple-data-frames-in-a-list-simultaneously)  

&lt;!-- End of automatically inserted text --&gt;

example `data.frames`:

     df1 = data.frame(id=c(&#39;1&#39;,&#39;73&#39;,&#39;2&#39;,&#39;10&#39;,&#39;43&#39;),v1=c(1,2,3,4,5)) &lt;br&gt;
     df2 = data.frame(id=c(&#39;7&#39;,&#39;23&#39;,&#39;57&#39;,&#39;2&#39;,&#39;62&#39;,&#39;96&#39;),v2=c(1,2,3,4,5,6)) &lt;br&gt;
     df3 = data.frame(id=c(&#39;23&#39;,&#39;62&#39;),v3=c(1,2)) &lt;br&gt;

Note: `id` is unique for each data.frame. I want the resulting matrix to look like

    1      1 NA NA 
    2      3  4 NA 
    7      NA 1 NA 
    10     4 NA NA 
    23     NA 2  1 
    43     5 NA NA 
    57     NA 3 NA 
    62     NA 5  2 
    73     2 NA NA 
    96     NA 6 NA
 
In this case, I only show 3 datasets, I actually have at least 22 of them so at the end I want a matrix of nx(22+1) where n is the number of ids for all 22 datasets. &lt;br&gt;

Given 2 datasets, I need to get their `ids` in the first column and 2nd and 3rd columns are filled with the values, if there is no value exists, then input `NA` instead.

Merging a lot of data.frames

I have some columns in R and for each row there will only ever be a value in one of them, the rest will be NA&#39;s. I want to combine these into one column with the non-NA value. Does anyone know of an easy way of doing this. For example I could have as follows:

    data &lt;- data.frame(&#39;a&#39; = c(&#39;A&#39;,&#39;B&#39;,&#39;C&#39;,&#39;D&#39;,&#39;E&#39;),
                       &#39;x&#39; = c(1,2,NA,NA,NA),
                       &#39;y&#39; = c(NA,NA,3,NA,NA),
                       &#39;z&#39; = c(NA,NA,NA,4,5))

So I would have

    &#39;a&#39; &#39;x&#39; &#39;y&#39; &#39;z&#39;  
     A   1   NA  NA  
     B   2   NA  NA  
     C  NA   3   NA  
     D  NA   NA  4  
     E  NA   NA  5

And I would to get
  
     &#39;a&#39; &#39;mycol&#39;  
      A   1  
      B   2  
      C   3  
      D   4  
      E   5  

The names of the columns containing NA changes depending on code earlier in the query so I won&#39;t be able to call the column names explicitly, but I have the column names of the columns which contains NA&#39;s stored as a vector e.g. in this example `cols &lt;- c(&#39;x&#39;,&#39;y&#39;,&#39;z&#39;)`, so could call the columns using `data[, cols]`.

Any help would be appreciated.

Thanks


Combine column to remove NA&#39;s

I&#39;m thinking if there is a way that when I merge a branch into another branch that ALL changed files are listed in my commit message and not just the ones which were modified in both branches.
This would give me a better overview of what was changed in the branch just by seeing the merge commit.
Is there a way to do this?

List all modified files in git merge commit - even the fast forwarded

Is there a good way to merge two objects in Python? Like a built-in method or fundamental library call?

Right now I have this, but it seems like something that shouldn&#39;t have to be done manually:

    def add_obj(obj, add_obj):
 
        for property in add_obj:
            obj[property] = add_obj[property]

Note: By &quot;object&quot;, I mean a &quot;dictionary&quot;: `obj = {}`

Merge two objects in Python

I want to know an exact algorithm (or near that) behind &#39;git merge&#39;. The answers at least to these sub-questions will be helpful:

 - How does git detect the context of a particular non-conflicting change?
 - How does git find out that there is a conflict in these exact lines?
 - Which things does git auto-merge?
 - How does git perform when there is no common base for merging branches?
 - How does git perform when there are multiple common bases for merging branches?
 - What happens when I merge multiple branches at once?
 - What is a difference between merge strategies?

But the description of a whole algorithm will be much better.

How does &#39;git merge&#39; work in details?

I am in the root folder of an SVN-hosted project&#39;s `trunk` and am exploring setting up two branches. 

One branch will be a &quot;snapshot&quot; of the project at the current (stable) revision, and a second branch will be one I&#39;ll work on to apply some new code, test, and then upgrade the trunk to a new version. 

My goal is to keep the snapshot as insurance and a quick way to get an older, stable version of our project. The second branch, once we apply fresh code and the tests pass, will be merged back into the trunk, which we offer to the public.

To set up the snapshot, I copied our `trunk` to a branch called `v1p2p3`:

    $ svn cp https://www.example.com/svn/trunk \ 
             https://www.example.com/svn/branches/v1p2p3 \
             -m &quot;Branching from root trunk to v1p2p3 at r1114&quot;

So far, so good:

    Committed revision 1115.

What I would like to do is switch my local repository copy to this branch, to make sure that things worked, but I get an error message:

    $ svn switch --relocate https://www.example.com/svn/trunk \
                            https://www.example.com/svn/branches/v1p2p3

The error message is:

    svn: E155024: Invalid relocation destination: 
                  &#39;https://www.example.com/svn/branches/v1p2p3&#39; 
                  (does not point to target)

What am I doing wrong?

(If this doesn&#39;t work, I suspect I can&#39;t get to starting on the more ambitious second branch. I&#39;m looking for a way to do this that won&#39;t damage the existing project layout. Thanks for your advice, and apologies if this is a dumb question.)

Svn switch from trunk to branch

Here are steps of code contribution from the topic &quot;https://stackoverflow.com/questions/4384776/how-do-i-contribute-to-others-code-in-github&quot;

 1. Fork the project
 2. Make one or more well commented and clean commits to the repository. You can make a new branch here if you are modifying more than one part or feature.
 3. Perform a pull request in github&#39;s web interface.

Is it possible to make a pull request without forking a repo?

It&#39;s quite sad to see more than 20 repos in my account which were forked for some pull requests. They have no activity then and zero stars / followers. Looks like I&#39;m just copying somebody&#39;s code for a black day.

Pull request without forking?

I have worked on a local branch and also pushed the changes to remote.

I want to revert the changes on that branch and do something else on it, but I don&#39;t want to lose the work completely. I was thinking of something like create a new branch locally and copy the old branch there, then I can revert the changes and continue working on the old branch. 

Is there a better way than this maybe?

How can I copy the content of a branch to a new local branch?

I want to load a different version of the files that exist in another branch into my current branch.


`git help checkout` says:

    DESCRIPTION
       Updates files in the working tree to match the version in the index or
       the specified tree. If no paths are given, git checkout will also
       update HEAD to set the specified branch as the current branch.


Is there a way to checkout all those files, but _not_ update HEAD?

git: checkout files from another branch into current branch (don&#39;t switch HEAD to the other branch)

When I was browsing GitHub repositories I quite often saw &quot;wip&quot; branches (e.g. `3.1.0-wip`). What does &quot;wip&quot; mean?

I couldn&#39;t find the answer anywhere - neither on Google nor on GitHub:help.

Content Type	Original Author	Original Content on Stackoverflow
Question	Alison	View Question on Stackoverflow
Solution 1 - Git	Jonas Schäfer	View Answer on Stackoverflow
Solution 2 - Git	Yohst	View Answer on Stackoverflow
Solution 3 - Git	ahmednabil88	View Answer on Stackoverflow

What to do with branch after merge

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Is there a "not equal" operator in Python?

In what cases could `git pull` be harmful?

Attributions