Check status (`git status`) of your repository. Every unmerged file (after you resolve conficts by yourself) should be added (`git add`), and if there is no unmerged file you should `git commit`

Note and update:

Since [Git1.7.4][1] (January 2011), you have `git merge --abort`, synonymous to &quot;`git reset --merge`&quot; when a merge is in progress.

But if you want to complete the merge, while somehow nothing remains to be added, then a crude `rm -rf .git/MERGE*` can be enough for Git to forget about the current merge.





  [1]: https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.4.txt

The easiest solution I found for this:

    git commit -m &quot;fixing merge conflicts&quot;
    git push


I just did:

    git merge --continue

At which point vi launched to edit a merge comment. A quick :wq and the merge was done.

If you encounter this error in SourceTree, go to Actions&gt;Resolve Conflicts&gt;Restart Merge.

SourceTree version used is 1.6.14.0

I have a virtualenv created for Python 2.5 and want to &quot;upgrade&quot; it to Python 2.6. 

Here is how it was originally set up: 

    virtualenv --no-site-packages -p python2.5 myenv

I now run virtualenv in the same directory to upgrade: 

    virtualenv --no-site-packages -p python2.6 myenv
    ...
    Not overwriting existing python script myenv/bin/python (you must use myenv/bin/python2.6)
    ...
    Overwriting myenv/bin/activate with new content

The default python is still 2.5, even though I can also specify 2.6.  Is there any way to *remove* 2.5 entirely and have &#39;bin/python&#39; point to 2.6 instead? 

Can existing virtualenv be upgraded gracefully?

Is there a one line macro definition to determine the endianness of the machine? I am using the following code but converting it to macro would be too long:

    unsigned char test_endian( void )
    {
        int test_var = 1;
        unsigned char *test_endian = (unsigned char*)&amp;test_var;
    
        return (test_endian[0] == 0);
    }


Macro definition to determine big endian or little endian machine?

After I merged a file in Git I tried to pull the repository but error came up:

&gt; You have not concluded your merge. (MERGE_HEAD exists)

How does one conclude a merge?


How to conclude your merge of a file?

After I merged a file in Git I tried to pull the repository but error came up:
> You have not concluded your merge. (MERGE_HEAD exists)
How does one conclude a merge?

When using `git config --global` to set things up, to which file will it write?

Example:

    git config --global core.editor &quot;blah&quot;

I can&#39;t find it at these places:

    C:\Program Files\Git\etc\gitconfig

    C:\myapp\.git\config

I have not set an ENV?

My Git version: 1.6.5.1.1367.gcd48 –
on Windows 7

Where is the global git config data stored?

I tried looking for a good tutorial on reducing repo size, but found none. How do I reduce my repo size...it&#39;s about 10 MB, but the thing is Heroku only allows 50 MB and I&#39;m no where near finished developing my app.

I added the usual suspects (log, vendor, doc etc) to .gitignore already. Although I only added .gitignore recently.

Any suggestions?

Reduce git repository size

There&#39;s ways to change the message from later commits:

&lt;!-- language: sh --&gt;

    git commit --amend                    # for the most recent commit
    git rebase --interactive master~2     # but requires *parent*

How can you change the commit message of the very first commit (which has no parent)?

Edit the root commit in Git?

Is there a way to wrap git commit comments (when viewed via `git log`), so they are not cut off at the end of the line? It seems like there should be a pretty simple solution, but I haven&#39;t been able to find one.

Thanks.

How to wrap git commit comments?

I have a newbie question about Git:

I need to move back and forth in a history of a branch.
That means, I need to get all the files to the state they were in in some old revision, and then I need to get back to the latest state in the repository. I don&#39;t need to commit.

 With SVN, it would be

    svn up -r800

to get to revision 800, and 

    svn up

to get in sync with the repository.

I know the hash of the commit I want to get back to, so I tried

    git reset &lt;hash&gt;

which seems to get me there. But then I tried

    git pull

but that complains about conflicts.

So what&#39;s the proper way to move through the history of the branch?

I&#39;m thinking in terms of SVN, so don&#39;t hezitate to point me to some nice tutorial. Note that I&#39;ve already checked http://git.or.cz/course/svn.html and http://www.youtube.com/watch?v=8dhZ9BXQgc4 .

Thanks, Ondra.

Git: How to move back and forth between commits

Branching sources for release cycle is one of common source management scenarios. Merging as soon as possible is a good practice. Thus we have a human factor: branch is closed, but someone forgot to merge something back to trunk.

Q: Is there a &quot;one click&quot; way to get all revision numbers that were not merged from branch X to trunk?

(Note: I do not need these revision numbers to find what to merge, I need them to create automated validation, that would remind people to make sure they did not forget to merge something to trunk. Merging itself is not an issue.)

It seems like svn mergeinfo command fails to help here. Passing branch and trunk roots will fail if merge was performed not on root level (and it is a common scenario).

Scripts, tools any kind of svn hooks as a solution are welcome.

P.S.

Latest version of SVN. No need to argue how common or good this scenario is ;)

Subversion: howto find all revisions that are not merged to trunk?

_note: this question and the following answers refer to data.table versions &lt; 1.5.3; v. 1.5.3 was released in Feb 2011 to resolve this issue._ see more recent treatment (03-2012): https://stackoverflow.com/questions/9914734/translating-sql-joins-on-foreign-keys-to-r-data-table-syntax

---

I&#39;ve been digging through the documentation for the &lt;a href=&quot;http://cran.r-project.org/web/packages/data.table/index.html&quot;&gt;data.table package&lt;/a&gt; (a replacement for data.frame that&#39;s much more efficient for certain operations), including &lt;a href=&quot;http://files.meetup.com/1406240/Data%20munging%20with%20SQL%20and%20R.pdf&quot;&gt;Josh Reich&#39;s presentation on SQL and data.table at the NYC R Meetup&lt;/a&gt; (pdf), but can&#39;t figure this totally trivial operation out.

    &gt; x &lt;- DT(a=1:3, b=2:4, key=&#39;a&#39;)
    &gt; x
         a b
    [1,] 1 2
    [2,] 2 3
    [3,] 3 4
    &gt; y &lt;- DT(a=1:3, c=c(&#39;a&#39;,&#39;b&#39;,&#39;c&#39;), key=&#39;a&#39;)
    &gt; y
         a c
    [1,] 1 a
    [2,] 2 b
    [3,] 3 c
    &gt; x[y]
         a b
    [1,] 1 2
    [2,] 2 3
    [3,] 3 4
    &gt; merge(x,y)
      a b c
    1 1 2 a
    2 2 3 b
    3 3 4 c

The docs say &quot;When [the first argument] is itself a data.table, a join is invoked similar to base::merge but uses binary search on the sorted key.&quot; Clearly this is not the case. Can I get the other columns from y into the result of x[y] with data.tables? It seems like it&#39;s just taking the rows of x where the key matches the key of y, but ignoring the rest of y entirely...


How to do a data.table merge operation

How can I get a list of all the model objects that have a ForeignKey pointing to an object?  (Something like the delete confirmation page in the Django admin before DELETE CASCADE).

I&#39;m trying to come up with a generic way of merging duplicate objects in the database.  Basically I want all of the objects that have ForeignKeys points to object &quot;B&quot; to be updated to point to object &quot;A&quot; so I can then delete &quot;B&quot; without losing anything important.

Thanks for your help!


Get all related Django model objects

I&#39;ve finished working on a feature branch `feature-x`. I want to merge results back to the `default` branch and close `feature-x` in order to get rid of it in the output of `hg branches`.

I came up with the following scenario, but it has some issues:

    $ hg up default
    $ hg merge feature-x
    $ hg ci -m merge
    $ hg up feature-x
    $ hg ci -m &#39;Closed branch feature-x&#39; --close-branch

So the `feature-x` branch (changests `40`-`41`) is closed, but there is *one new head*, the closing branch changeset `44`, that will be listed in `hg heads` every time:

    $ hg log ...
    o  44 Closed branch feature-x
    |
    | @  43 merge
    |/|
    | o  42 Changeset C
    | |
    o |  41 Changeset 2
    | |
    o |  40 Changeset 1
    |/
    o  39 Changeset B
    |
    o  38 Changeset A
    |

**Update**: It appears that since version 1.5 Mercurial doesn&#39;t show heads of closed branches in the output of `hg heads` anymore.

Is it possible to close a merged branch without leaving one more head? Is there more correct way to close a feature branch?

Related questions:

* [Is there a downside to this Mercurial workflow: named branch &quot;dead&quot; head?][1]

  [1]: https://stackoverflow.com/questions/3638987/is-there-a-downside-to-this-mercurial-workflow-named-branch-dead-head


How to correctly close a feature branch in Mercurial?

I have been trying for a few days now to make my layouts more efficient by converting from using several levels of nested `LinearLayouts` to one `RelativeLayout` and have come across a few problems that I haven not been able to find a workaround for...

I have searched the Android beginners group and this site and have not been able to find anything that would help me solve the problem.

I read on one of the blogs that you can combine layouts with merge and include tags. So what I have is a main layout file with a `RelativeLayout` root element.  Inside of that I have 5 include tags that reference 5 different xml layout files that each have a merge element for the root (all of my merge files are the same except for the ids in them). 

I am running into two problems, which I will explain after posting a simplified version of my layout code:

**Sample Main Layout File:**

    &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
    &lt;RelativeLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
        android:layout_width=&quot;fill_parent&quot;
        android:layout_height=&quot;fill_parent&quot;
        android:background=&quot;@drawable/translucent_gray&quot; &gt;

        &lt;include 
            android:id=&quot;@+id/running_gallery_layout_id&quot;
            layout=&quot;@layout/running_gallery_layout&quot; /&gt;

        &lt;include 
            android:id=&quot;@+id/recent_gallery_layout_id&quot; 
            layout=&quot;@layout/recent_gallery_layout&quot;
            android:layout_below=&quot;@id/running_gallery_layout_id&quot; /&gt;

        &lt;include
            android:id=&quot;@+id/service_gallery_layout_id&quot;
            layout=&quot;@layout/service_gallery_layout&quot;
            android:layout_below=&quot;@id/recent_gallery_layout_id&quot; /&gt;

        &lt;include
            android:id=&quot;@+id/process_gallery_layout_id&quot;
            layout=&quot;@layout/process_gallery_layout&quot;
            android:layout_below=&quot;@id/service_gallery_layout_id&quot; /&gt;

    &lt;/RelativeLayout&gt;
    
**Sample included merge file:**

    &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
    &lt;merge xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;&gt;
        &lt;TextView 
            style=&quot;@style/TitleText&quot;
            android:id=&quot;@+id/service_gallery_title_text_id&quot;
            android:layout_width=&quot;wrap_content&quot;
            android:layout_height=&quot;wrap_content&quot;
            android:gravity=&quot;left&quot;
            android:text=&quot;@string/service_title&quot; /&gt;

        &lt;Gallery
            android:id=&quot;@+id/service_gallery_id&quot;
            android:layout_width=&quot;fill_parent&quot;
            android:layout_height=&quot;wrap_content&quot;
            android:layout_weight=&quot;1&quot;
            android:layout_below=&quot;@id/service_gallery_title_text_id&quot; /&gt;

        &lt;TextView 
            style=&quot;@style/SubTitleText&quot;
            android:id=&quot;@+id/service_gallery_current_text_id&quot;
            android:layout_width=&quot;wrap_content&quot;
            android:layout_height=&quot;wrap_content&quot;
            android:layout_toRightOf=&quot;@id/service_gallery_title_text_id&quot;
            android:layout_above=&quot;@id/service_gallery_id&quot; /&gt;
    &lt;/merge&gt;

I am running into two problems:

1) The `android:layout_*` attributes seem to be ignored when used in the include tag and all of the merged layouts are displayed on top of each other.  According to this post ([http://developer.android.com/resources/articles/layout-tricks-reuse.html][1]) &quot;any `android:layout_*` attribute can be used with the `&lt;include /&gt;` tag&quot;

2) Since I couldn&#39;t get this working I decided to try adding an `android:layout_below` attribute to the first `TextView` item in each merge layout file, meaning that each merge file would be referencing an id from another merge layout file... For the most part this actually worked and my layout looks fine.  However, I get an error on one of the `android:layout_below` attributes saying that it can&#39;t find the id I specified... I have double and triple checked the ids to make sure they were correct.  The weirdest part is that I used the `AutoFill` feature to put the id in the attribute in the first place.

If anyone has any suggestions or workarounds I will be more than happy to try them out.  Also, if anyone can think of a way for me to just have one merge xml layout file instead of 5 that would be greatly appreciated.  I couldn&#39;t find a way to do that because I need to have access to each item in the merge layout files at runtime...


  [1]: http://developer.android.com/resources/articles/layout-tricks-reuse.html

Content Type	Original Author	Original Content on Stackoverflow
Question	Muaz Al-Jarhi	View Question on Stackoverflow
Solution 1 - Git	MBO	View Answer on Stackoverflow
Solution 2 - Git	VonC	View Answer on Stackoverflow
Solution 3 - Git	user3127648	View Answer on Stackoverflow
Solution 4 - Git	Stan	View Answer on Stackoverflow
Solution 5 - Git	Cebu CM Solutions	View Answer on Stackoverflow

How to conclude your merge of a file?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

Macro definition to determine big endian or little endian machine?

Can existing virtualenv be upgraded gracefully?

Attributions