Tasnad: On Mon, Nov 25, 2019 at 09:15:18PM +0100, Tasnad Kernetzky wrote: > Hi Brandon, Hello, > On 22.11.19 04:14, Brandon McCaig wrote: [...] > > When you switch back to branch B the state of the tst file is > > the same as it exists in the branch B. There is no conflict > > here so it succeeds, and once it does you no longer have any > > changes made to tst because the version in your index and > > working tree matches the version in the HEAD commit. > > > > git status at this point would report nothing (assuming no > > other files are modified). > > This is the point I actually considered as a bug. There are > staged changes and usually git doesn't let me switch away from > a branch in such cases. I think that Git normally will let you change branches even if you have changes in your index or working tree as long as the version of the file in your destination branch matches the HEAD version. In other words no merge is necessary and no changes can be lost. I regularly do this when I start making changes on develop or master, and then decide to branch after the fact. It's a bit less typing than stashing in between. :) For example: git init checkout cd checkout echo master >log git add log git commit -m master git checkout -b B echo B >>log git add log git checkout master git status Regards, -- Brandon McCaig <bamccaig@xxxxxxxxx> <bambams@xxxxxxxxxxxxxxxx> Castopulence Software <https://www.castopulence.org/> Blog <http://www.bambams.ca/> perl -E '$_=q{V zrna gur orfg jvgu jung V fnl. }. q{Vg qbrfa'\''g nyjnlf fbhaq gung jnl.}; tr/A-Ma-mN-Zn-z/N-Zn-zA-Ma-m/;say'
Attachment:
signature.asc
Description: PGP signature
