This appears to be a built-in way to achieve that (v1.7.4):

    git for-each-ref --sort=committerdate refs/heads/ --format=&#39;%(committerdate:short) %(refname:short)&#39;



I&#39;ve enjoyed the @Will Sheppard solution to put some colors. 

    git for-each-ref --sort=committerdate refs/heads/ --format=&#39;%(color: red)%(committerdate:short) %(color: cyan)%(refname:short)&#39;

How do I split the filename out of a full path in batch scripting?

How to split the filename from a full path in batch?

If I can use `${project.build.sourceDirectory}` to reference the source directory, what do I use to reference the &quot;resources&quot; directory?

Looking at the super pom, it would seem that `${project.build.resources.resource.directory}` would work, but it does not . . .

Referencing resources directory from project object model variables

How can I list git branches showing and sorting by their last commits&#39; dates?

I&#39;ve found [this](http://www.commandlinefu.com/commands/view/2345/show-git-branches-by-date-useful-for-showing-active-branches):

    for k in `git branch | sed s/^..//`; do
        echo -e `git log -1 --pretty=format:&quot;%Cgreen%ci %Cblue%cr%Creset&quot; &quot;$k&quot;`\\t&quot;$k&quot;;
    done | sort -r

I&#39;d expect plain git to have this feature. Does it?

I also found `git show-branch --date-order` but the output is something different.

Git: List git branches, sort by (and show) date

How can I list git branches showing and sorting by their last commits' dates?
I've found <a href="http://www.commandlinefu.com/commands/view/2345/show-git-branches-by-date-useful-for-showing-active-branches" target="_blank" rel="noopener noreferrer">this</a>:
<pre><code class="hljs language-bash">for k in `git branch | sed s/^..//`; do
 echo -e `git log -1 --pretty=format:"%Cgreen%ci %Cblue%cr%Creset" "$k"`\\t"$k";
done | sort -r
</code></pre>
I'd expect plain git to have this feature. Does it?
I also found <code>git show-branch --date-order</code> but the output is something different.

I don&#39;t want to commit my PyCharm config files (e.g. .idea/codeStyleSettings.xml) to my git repository, so I added the following to my .gitignore file:

    .idea/
    mydjangosite/.idea/

However, every time I try to make a commit within PyCharm (command k), it still wants to commit these files. How do I get PyCharm to recognize my .gitignore file and not commit these files?

How do I ignore PyCharm configuration files in a git repository?

`git pull --help` says:

&gt; In its default mode, `git pull` is shorthand for `git fetch` followed by `git merge FETCH_HEAD`.

What is this `FETCH_HEAD` and what is actually merged during `git pull`?

What does FETCH_HEAD in Git mean?

I regret having applied a stash (wrong branch). How can I undo this and have my stash back to my stash list in order to apply it later on the right branch?

Aborting `git stash apply`

What is the difference between `origin` and `upstream` on [GitHub][1]?

When a `git branch -a` command is executed, some branches it displays have a prefix of `origin` (`remotes/origin/..`) while others have a prefix of `upstream` (`remotes/upstream/..`).

  [1]: http://en.wikipedia.org/wiki/GitHub


What is the difference between origin and upstream on GitHub?

I get this error when I try to change branch.

Probably I will give some information of the commands at 

    /path/to/git/repo/.

upon command:

    git branch

I get following output

    * V1.5
      V2.0
      master

And when I try the command 

    git checkout V2.0

I get following output:

    fatal: This operation must be run in a work tree

config file contents:


    cat config 
    [core]
            repositoryformatversion = 0
            filemode = true
            bare = true
    [remote &quot;origin&quot;]
            url = /path/to/git/repo/.git

fatal: This operation must be run in a work tree

I had this code:

        String[] lineElements;       
        . . .
        try
        {
            using (StreamReader sr = new StreamReader(&quot;TestFile.txt&quot;))
            {
                String line;
                while ((line = sr.ReadLine()) != null)
                {
                    lineElements = line.Split(&#39;,&#39;);
                    . . .

but then thought I should maybe go with a List&lt;String&gt; instead. But this code:

        List&lt;String&gt; listStrLineElements;
        . . .
        try
        {
            using (StreamReader sr = new StreamReader(&quot;TestFile.txt&quot;))
            {
                String line;
                while ((line = sr.ReadLine()) != null)
                {
                    listStrLineElements = line.Split(&#39;,&#39;);
	. . .

...gives me, &quot;*Cannot implicitly convert type &#39;string[]&#39; to &#39;System.Collections.Generic.List&lt;string&gt;&#39;*&quot;

How to split() a delimited string to a List&lt;String&gt;

    string tags = &quot;9,3,12,43,2&quot;
    
    List&lt;int&gt; TagIds = tags.Split(&#39;,&#39;);

This doesn&#39;t work cause the split method returns a string[]

How can I convert comma separated string into a List&lt;int&gt;

If I use:

    var strings = new List&lt;string&gt; { &quot;sample&quot; };
    foreach (string s in strings)
    {
      Console.WriteLine(s);
      strings.Add(s + &quot;!&quot;);
    }

the `Add` in the `foreach` throws an InvalidOperationException (Collection was modified; enumeration operation may not execute), which I consider logical, since we are pulling the rug from under our feet.

However, if I use:

    var strings = new List&lt;string&gt; { &quot;sample&quot; };
    strings.ForEach(s =&gt;
      {
        Console.WriteLine(s);
        strings.Add(s + &quot;!&quot;);
      });

it promptly shoots itself in the foot by looping until it throws an OutOfMemoryException.

This comes as a suprise to me, as I always thought that List&lt;T&gt;.ForEach was either just a wrapper for `foreach` or for `for`.  
Does anyone have an explanation for the how and the why of this behavior?

(Inpired by https://stackoverflow.com/questions/9311272/foreach-loop-for-a-generic-list-repeated-endlessly)

Why does List&lt;T&gt;.ForEach allow its list to be modified?

I have a function that parses a file into a list. I&#39;m trying to return that list so I can use it in other functions. 

    def splitNet():
        network = []
        for line in open(&quot;/home/tom/Dropbox/CN/Python/CW2/network.txt&quot;,&quot;r&quot;).readlines():
            line = line.replace(&quot;\r\n&quot;, &quot;&quot;)
            line = string.split(line, &#39;,&#39;)
            line = map(int, line)
            network.append(line)
        return network

When I try to print the list outside of the function (for debugging) I get this error:

    NameError: name &#39;network&#39; is not defined

Is there something simple I am doing wrong or is there a better way to pass variables between functions without using globals?

Python return list from function

I&#39;m having issues getting a block of code to run properly. I&#39;m not entirely sure WHAT this code does (I&#39;m trying to get a plugin that&#39;s out of date to work properly with our server), I just know every 20 minutes it runs and throws out an error. Here&#39;s the section of code where the issue is happening:

    public class DynamicThread extends Thread {
    private LocalShops plugin = null;


    public DynamicThread(ThreadGroup tgroup, String tname, LocalShops plugin) {
        super(tgroup, tname);
        this.plugin = plugin;
    }

    public void run() {
        Map&lt;ItemInfo, List&lt;Integer&gt;&gt; itemStockMap = Collections.synchronizedMap(new HashMap&lt;ItemInfo, List&lt;Integer&gt;&gt;());
        
        //Dump all the shop stock data into the map.
        for ( Shop shop : plugin.getShopManager().getAllShops() ) {
            for ( InventoryItem item : shop.getItems() ) {
                if (itemStockMap.containsKey(item.getInfo()))
                    itemStockMap.get(item.getInfo()).add(item.getStock()); //Where error happens
                else
                    itemStockMap.put(item.getInfo(), Arrays.asList(item.getStock()));     
            }
        }
        for(ItemInfo item : itemStockMap.keySet()) {
            List&lt;Integer&gt; stockList = GenericFunctions.limitOutliers(itemStockMap.get(item));
            //remove the map before re-adding it
            if (DynamicManager.getPriceAdjMap().containsKey(item)) 
                DynamicManager.getPriceAdjMap().remove(item);
            
            //Get the overall stock change for a given item and then calculate the adjustment given the volatility
            int deltaStock = GenericFunctions.getSum(stockList) - Config.getGlobalBaseStock();
            DynamicManager.getPriceAdjMap().put(item, GenericFunctions.getAdjustment(Config.getGlobalVolatility(), deltaStock)); 
        }
        
        Bukkit.getServer().getScheduler().callSyncMethod(plugin, plugin.getShopManager().updateSigns());
    }

}


The error happens from line 42, which is:

                    itemStockMap.get(item.getInfo()).add(item.getStock());

The error it outputs happens every 20 minutes twice with 2 seconds in between.

    2012-02-16 16:53:25 [INFO] Launch Dynamic Thread
    2012-02-16 16:53:25 [SEVERE] Exception in thread &quot;dynamic&quot; 
    2012-02-16 16:53:25 [SEVERE] java.lang.UnsupportedOperationException
    2012-02-16 16:53:25 [SEVERE] at java.util.AbstractList.add(AbstractList.java:131)
    2012-02-16 16:53:25 [SEVERE] at java.util.AbstractList.add(AbstractList.java:91)
    2012-02-16 16:53:25 [SEVERE] at       com.milkbukkit.localshops.threads.DynamicThread.run(DynamicThread.java:42)

    2012-02-16 16:53:27 [INFO] Launch Dynamic Thread
    2012-02-16 16:53:27 [SEVERE] Exception in thread &quot;dynamic&quot; 
    2012-02-16 16:53:27 [SEVERE] java.lang.UnsupportedOperationException
    2012-02-16 16:53:27 [SEVERE] at java.util.AbstractList.add(AbstractList.java:131)
    2012-02-16 16:53:27 [SEVERE] at java.util.AbstractList.add(AbstractList.java:91)
    2012-02-16 16:53:27 [SEVERE] at     com.milkbukkit.localshops.threads.DynamicThread.run(DynamicThread.java:42)


Thanks in advance for any help. 

UnsupportedOperationException at java.util.AbstractList.add

I&#39;m making a small program for math (no particular reason, just kind of wanted to) and I ran into the error &quot;TypeError: &#39;NoneType&#39; object is not subscriptable.

I have never before seen this error, so I have no idea what it means.

    import math
    
    print(&quot;The format you should consider:&quot;)
    print str(&quot;value 1a&quot;)+str(&quot; + &quot;)+str(&quot;value 2&quot;)+str(&quot; = &quot;)+str(&quot;value 3a &quot;)+str(&quot;value 4&quot;)+str(&quot;\n&quot;)
    
    print(&quot;Do not include the letters in the input, it automatically adds them&quot;)
    
    v1 = input(&quot;Value 1: &quot;)
    v2 = input(&quot;Value 2: &quot;)
    v3 = input(&quot;Value 3: &quot;)
    v4 = input(&quot;Value 4: &quot;)
    
    lista = [v1, v3]
    lista = list.sort(lista)
    
    a = lista[1] - lista[0]
    
    list = [v2, v4]
    list = list.sort(list)
    
    b = list[1] = list[0]
    
    print str(a)+str(&quot;a&quot;)+str(&quot; = &quot;)+str(b)


The error:

    Traceback (most recent call last):
      File &quot;C:/Users/Nathan/Documents/Python/New thing&quot;, line 16, in &lt;module&gt;
        a = lista[1] - lista[0]
    TypeError: &#39;NoneType&#39; object is not subscriptable



Python Math - TypeError: &#39;NoneType&#39; object is not subscriptable

&gt; **Possible Duplicate:**  
&gt; [python: how to sort a complex list on two different keys](https://stackoverflow.com/questions/3979872/python-how-to-sort-a-complex-list-on-two-different-keys)  

&lt;!-- End of automatically inserted text --&gt;

I&#39;ve got a list of tuples. I want to sort them depending two elements. Here is following example

    unsorted = [(&#39;a&#39;, 4, 2), (&#39;a&#39;, 4, 3), (&#39;a&#39;, 7, 2), (&#39;a&#39;, 7, 3), (&#39;b&#39;, 4, 2), (&#39;b&#39;, 4, 3), (&#39;b&#39;, 7, 2), (&#39;b&#39;, 7, 3)]
    sorted   = [(&#39;a&#39;, 4, 2), (&#39;b&#39;, 4, 2), (&#39;a&#39;, 4, 3), (&#39;b&#39;, 4, 3), (&#39;a&#39;, 7, 2), (&#39;b&#39;, 7, 2), (&#39;a&#39;, 7, 3), (&#39;b&#39;, 7, 3)]

I know how to sort them on the second element:

    sorted(unsorted, key = lambda element : element[1])

But how to do that with two keys?

Sort a list of tuples depending on two elements

For Array, there is a pretty `sort` method to rearrange the sequence of elements. I want to achieve the same results for a String.

For example, I have a string `str = &quot;String&quot;`, I want to sort it alphabetically with one simple method to `&quot;ginrSt&quot;`.
      
Is there a native way to enable this or should I include mixins from `Enumerable`?

How to sort a string&#39;s characters alphabetically?

I have a CSV-like file, and I would like to sort it by column priority, like [&quot;ORDER BY&quot; in SQL](https://dev.mysql.com/doc/refman/8.0/en/sorting-rows.html). For example, given the following rows,

    3;1;2
    1;3;2
    1;2;3
    2;3;1
    2;1;3
    3;2;1

If &quot;ORDER BY&quot; were `column2, column1, column3`, the result would be:

    2;1;3
    3;1;2
    1;2;3
    3;2;1
    1;3;2
    2;3;1

I&#39;d like to know how to get this same result using the `sort` command on Unix.

Sort CSV file by multiple columns using the &quot;sort&quot; command

I have an array populated by dictionaries, and I need to sort the array alphabetically by the values of one of the keys of the dictionaries.

This is my array:

    tu dictus: (
        {
        brand = Ryul;
        productTitle = Any;
        quantity = 1;
        subBrand = &quot;Ryul INJ&quot;;
        type = Product;
    },
        {
        brand = Trol;
        productTitle = Different;
        quantity = 2;
        subBrand = &quot;&quot;;
        type = Brand;
    },
        {
        brand = Dtor;
        productTitle = Any;
        quantity = 1;
        subBrand = &quot;&quot;;
        type = Product;
    },
        {
        brand = Ryul;
        productTitle = Different;
        quantity = 2;
        subBrand = &quot;Ryul CHES&quot;;
        type = SubBrand;
    },
        {
        brand = Anan;
        productTitle = Any;
        quantity = 1;
        subBrand = &quot;&quot;;
        type = Product;
    }
    )


Normally for sorting an array I will use 

    myArray = [uniqueProdsArray sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];

But how do sort using the `brand` key of the dictionary?

Sorting NSArray of dictionaries by value of a key in the dictionaries

I am having the following problem in Java (I see some people are having
a similar problem in JavaScript but I&#39;m using Java)

    System.out.println(new Date().getYear());
    System.out.println(new GregorianCalendar().getTime().getYear());
    System.out.println(this.sale.getSaleDate().getYear());
    System.out.println(this.sale.getSaleDate().getMonth());
    System.out.println(this.sale.getSaleDate().getDate());

returns

    I/System.out( 4274): 112
    I/System.out( 4274): 112
    I/System.out( 4274): 112
    I/System.out( 4274): 1
    I/System.out( 4274): 11

I don&#39;t understand the 112 bit which I thought would have been 2012.
What&#39;s going on? Is the
`java.util.Date` class unusable? I am storing this as a field in several
of my classes to store a date and time. What should I do?

java.util.Date and getYear()

I have two Ruby on Rails DateTime objects. How to find the number of months between them? (Keeping in mind they might belong to different years)

Find number of months between two Dates in Ruby on Rails

*Using JPA 2 with EclipseLink implementation.*

I&#39;m trying to build a dynamic query which should bring me some records persisted after a given date.

    CriteriaBuilder builder = em.getCriteriaBuilder();
    CriteriaQuery&lt;Event&gt; criteria = builder.createQuery(Event.class);
    Root&lt;Event&gt; root = criteria.from(Event.class);
    criteria.select(root);
    criteria.distinct(true);
    List&lt;Predicate&gt; predicates = new ArrayList&lt;Predicate&gt;();
    //...
    if (dateLimit != null){
        ParameterExpression&lt;Date&gt; param = builder.parameter(Date.class, &quot;dateLimit&quot;);
        predicates.add(builder.lessThanOrEqualTo(root.get(&quot;dateCreated&quot;), param));
    }

`lessThanOrEqualTo()` and `le()` are the only two methods in the API which look like may help me in this case. This warning is thrown by the eclipse though:

    Bound mismatch: The generic method lessThanOrEqualTo(Expression&lt;? extends Y&gt;, Expression&lt;? extends Y&gt;)
    of type CriteriaBuilder is not applicable for the arguments (Path&lt;Object&gt;, ParameterExpression&lt;Date&gt;).
    The inferred type Object is not a valid substitute for the bounded parameter
    &lt;Y extends Comparable&lt;? super Y&gt;&gt;

I can imagine that I&#39;m not taking the correct approach for this problem but I can&#39;t find anywhere some tips or pointers for a possible solution.


Compare Date entities in JPA Criteria API

I have a Date object in Java stored as Java&#39;s Date type.

I also have a Gregorian Calendar created date. The gregorian calendar date has no parameters and therefore is an instance of today&#39;s date (and time?).

With the java date, I want to be able to get the year, month, day, hour, minute, and seconds from the java date type and compare the the gregoriancalendar date.

I saw that at the moment the Java date is stored as a long and the only methods available seem to just write the long as a formatted date string. Is there a way to access Year, month, day, etc?

I saw that the `getYear()`, `getMonth()`, etc. methods for `Date` class have been deprecated. I was wondering what&#39;s the best practice to use the Java Date instance I have with the `GregorianCalendar` date.

My end goal is to do a date calculation so that I can check that the Java date is within so many hours, minutes etc of today&#39;s date and time.

I&#39;m still a newbie to Java and am getting a bit puzzled by this.


I want to get Year, Month, Day, etc from Java Date to compare with Gregorian Calendar date in Java. Is this possible?

I have a vector of dates and for each entry, I would like to assign a season. So for example, if a date is between 21.12. and 21.3., I would says that&#39;s `winter`. So far I have tried the following code but I couldn&#39;t make it more generic, _irrespective of the year_.

    my.dates &lt;- as.Date(&quot;2011-12-01&quot;, format = &quot;%Y-%m-%d&quot;) + 0:60
    low.date &lt;- as.Date(&quot;2011-12-15&quot;, format = &quot;%Y-%m-%d&quot;)
    high.date &lt;- as.Date(&quot;2012-01-15&quot;, format = &quot;%Y-%m-%d&quot;)

    my.dates[my.dates &lt;= high.date &amp; my.dates &gt;= low.date] 
     [1] &quot;2011-12-15&quot; &quot;2011-12-16&quot; &quot;2011-12-17&quot; &quot;2011-12-18&quot; &quot;2011-12-19&quot; &quot;2011-12-20&quot; &quot;2011-12-21&quot; &quot;2011-12-22&quot; &quot;2011-12-23&quot; &quot;2011-12-24&quot; &quot;2011-12-25&quot;
    [12] &quot;2011-12-26&quot; &quot;2011-12-27&quot; &quot;2011-12-28&quot; &quot;2011-12-29&quot; &quot;2011-12-30&quot; &quot;2011-12-31&quot; &quot;2012-01-01&quot; &quot;2012-01-02&quot; &quot;2012-01-03&quot; &quot;2012-01-04&quot; &quot;2012-01-05&quot;
    [23] &quot;2012-01-06&quot; &quot;2012-01-07&quot; &quot;2012-01-08&quot; &quot;2012-01-09&quot; &quot;2012-01-10&quot; &quot;2012-01-11&quot; &quot;2012-01-12&quot; &quot;2012-01-13&quot; &quot;2012-01-14&quot; &quot;2012-01-15&quot;

I have tried formatting the dates without the year, but it isn&#39;t working.

    ld &lt;- as.Date(&quot;12-15&quot;, format = &quot;%m-%d&quot;)
    hd &lt;- as.Date(&quot;01-15&quot;, format = &quot;%m-%d&quot;)
    my.dates[my.dates &lt;= hd &amp; my.dates &gt;= ld] 

Find which season a particular date belongs to

I understand the scenario presented in Pro Git about [The Perils of Rebasing][1]. The author basically tells you how to avoid duplicated commits:

&gt; Do not rebase commits that you have pushed to a public repository.

I am going to tell you my particular situation because I think it does not exactly fit the Pro Git scenario and I still end up with duplicated commits.

Let&#39;s say I have two remote branches with their local counterparts:

    origin/master    origin/dev
    |                |
    master           dev

All four branches contains the same commits and I am going to start development in `dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4
    dev           : C1 C2 C3 C4

After a couple of commits I push the changes to `origin/dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4 C5 C6  # (2) git push
    dev           : C1 C2 C3 C4 C5 C6  # (1) git checkout dev, git commit

I have to go back to `master` to make a quick fix:

    origin/master : C1 C2 C3 C4 C7  # (2) git push
    master        : C1 C2 C3 C4 C7  # (1) git checkout master, git commit
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C5 C6

And back to `dev` I rebase the changes to include the quick fix in my actual development:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;  # git checkout dev, git rebase master

If I display the history of commits with GitX/gitk I notice that `origin/dev` now contains two identical commits `C5&#39;` and `C6&#39;` which are different to Git. Now if I push the changes to `origin/dev` this is the result:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6 C7 C5&#39; C6&#39;  # git push
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;

Maybe I don&#39;t fully understand the explanation in Pro Git, so I would like to know two things:

 1. Why does Git duplicate these commits while rebasing? Is there a particular reason to do that instead of just applying `C5` and `C6` after `C7`?
 2. How can I avoid that? Would it be wise to do it?

  [1]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_rebase_peril

Git commits are duplicated in the same branch after doing a rebase

I just renamed my local branch using

    git branch -m oldname newname

but this only renames the local version of the branch. How can I rename the one on&#160;GitHub?

Renaming a branch in GitHub

I have **master** and **new-project** branches. And now I&#39;d like to create a brand new repo with its master based on the new-project branch.

Background: I have one repository which contains three independent applications. It didn&#39;t start out this way. There was originally just one app in the repo. Over time, however, business needs have changed. One app became two (a legacy version and a re-write.) A web service was added. Separate branches were used to contain the three projects. However, they don&#39;t share any code. And so it&#39;d be simpler to have them split out into their own repos.

How do I create a new GitHub repo from a branch in an existing repo?

My colleague and I are working on the same repository. We&#39;ve branched it into two branches, each technically for different projects, but they have similarities, so we&#39;ll sometimes want to commit back to the *`master` from the `branch`.

However, I have the `branch`. How can my colleague pull that branch specifically?

A `git clone` of the repository does not seem to create the branches locally for him, though I can see them live on unfuddle after a push on my end.

Also, when I originally made the branch, I did `-b checkout`. Does that make much difference?

    $ git branch -r
    origin/HEAD -&gt; origin/master
    origin/daves_branch
    origin/discover
    origin/master

    $ git fetch origin discover
    $ git checkout discover

These are the commands I ran. But it definitely is not working.

**I want to be able to check out that branch and then push and commit back just the branches changes from various collaborators or workstations**.


Git fetch remote branch

There&#39;ve been several questions recently about skipping changes when maintaining release branches in Mercurial. For example:

 * [Mercurial: Branch specific changes keep coming back after dummy merge][1]
 * [Why are Mercurial backouts in one branch affecting other branches?][2]

Since it was introduced in 2.0, I&#39;ve wondered about using `graft` to avoid this problem. Given a revision tree like this:

    A---B---C---D---E---F---G---H---I---J

Suppose we need to create a release branch that skips the Evil change `E`.

    hg update -r D
    hg graft &quot;F::J&quot;

giving us:

    A---B---C---D---E---F---G---H---I---J
                 \
                  --F&#39;--G&#39;--H&#39;--I&#39;--J&#39;

 - Q1: What just happened here? I can understand that `transplant` would have generated patches out of `F::J`, and then applied them onto `D`, but `graft` is said to use the 3-way merge rather than patches. So....... how does that work? Why is it better?

Lets say I now fix `E`, and merge that into my release branch.

                      --E2-----------------
                     /                     \
    A---B---C---D---E---F---G---H---I---J---M1
                 \                            \
                  --F&#39;--G&#39;--H&#39;--I&#39;--J&#39;---------M2--

M1 is a straight merge; nothing special there.
M2 is merging branches which have &quot;the same&quot; (or at least equivalent) changes on.

 - Q2: Is this merge just a normal 3-way merge using `D`, `J&#39;` and `M1`?
 - Q3: Has mercurial stored/used extra information about the graft operation to help it with the merge?

And finally...

 - Q4: What are the potential problems with a flow like this?


 [1]: https://stackoverflow.com/questions/9532823/mercurial-branch-specific-changes-keep-coming-back-after-dummy-merge
 [2]: https://stackoverflow.com/questions/9500399/why-are-mercurial-backouts-in-one-branch-affecting-other-branches

Content Type	Original Author	Original Content on Stackoverflow
Question	Ondra Žižka	View Question on Stackoverflow
Solution 1 - Git	Will Sheppard	View Answer on Stackoverflow
Solution 2 - Git	JmLavoier	View Answer on Stackoverflow

Git: List git branches, sort by (and show) date

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Referencing resources directory from project object model variables

How to split the filename from a full path in batch?

Attributions