git stash apply results in the conflict - why? -


i've tried unstash changes , git reported conflict:

auto-merging core/scaldi/modules.scala conflict (content): merge conflict in core/scaldi/modules.scala

i'm curious why conflict occurs, since have no changes neither in working directory nor in index:

git diff          #outputs nothing git diff --cached #outputs nothing git status        #outputs `nothing commit, working directory clean`

'm curious why conflict occurs, since have no changes neither in working directory nor in index:

it's not enough. seems stashed changes commits ago.

assume tree looks this:

a------b------c------d[master]         \                          stashed -------^ (stash apply)          sources

so stashed file changes of core/scaldi/modules.scala conflicts changes in c or d.


Comments

Post a Comment

Popular posts from this blog

javascript - AngularJS custom datepicker directive -

i make custom datepicker directive custom template. but have no idea how start building it... how include date data directive? i appreciate guide or give me advice work on more precisely. it might you! follow below steps html code sample: <label>birth date</label> <input type="text" ng-model="birthdate" date-options="dateoptions" custom-datepicker/> <hr/> <pre>birthdate = {{birthdate}}</pre> <script type="text/ng-template" id="custom-datepicker.html"> <div class="enhanced-datepicker"> <div class="proxied-field-wrap"> <input type="text" ui-date-format="yy-mm-dd" ng-model="ngmodel" ui-date="dateoptions"/> </div> <label> <button class="btn" type="button"><i class="icon-calendar"></i>
Read more

javascript - jQuery date picker - Disable dates after the selection from the first date picker -

<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jquery ui datepicker - default functionality</title> <link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css"> <script src="//code.jquery.com/jquery-1.10.2.js"></script> <script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script> <link rel="stylesheet" href="/resources/demos/style.css"> <script> $(function () { $("#datepicker1").datepicker(); }); </script> <script> $(function () { $("#datepicker2").datepicker(); }); </script> </head> <body> <p>date 1: <input type="text" id="datepicker1"></p> <p>date 2: <input type="t
Read more