> (5) Commit Dialog popup - Commit. Get another popup: Do you want to
> unstaged changes, which won't be included in the Merge commit. Commit
I can't reproduce that. There must be very specific conditions for this problem to occur. Hence, please send a couple of screenshots (to
) showing the Files selection before invoking Commit and screenshots of the commit wizard, including information which buttons/options you have selected.
> Yes, I am able to reproduce this. Here are the steps I'm following:
>
> (1) create local branch
> (2) checkout local branch
> (3) develop - merge to working tree
> (4) commit
> (5) Commit Dialog popup - Commit. Get another popup: Do you want to
> commit just the staged changes of the Merge? Your working tree contains
> unstaged changes, which won't be included in the Merge commit. Commit
> Staged Changes - Commit All Changes
>
> If I look in main Files panel, there are 21 modified files in the Files
> tab that are modified; the same 21 files are listed in the Commit dialog.
>
> I think I may have a clue as to what is happening. On the develop
> branch, some files were apparently added and then deleted. So, when I
> do the merge of develop into the working tree, a couple files are listed
> as "Added - Missing".
>
> If I select Commit Staged Changes, 19 files are committed 19 files. 2
> missing files not committed.
>
> If I select Commit All Changes, SmartGit adds 2 untracked files not
> listed in the commit window.
>
> Thanks.
>
> On 2/21/2015 4:15 AM, syntevo Support
[hidden email] [smartgit] wrote:
> > > At this point, SmartGit puts up a message box saying that more files are
> > > affected than I'm committing.
> >
> > This is strange. In merging state, SmartGit should only offer to commit
> > *all* modifications. Are submodules affected by the merge? Can you still
> > reproducible this problem when going back to your last commit before the
> > merge (in a temporary branch) and redo the merge?
> >
> > --
> > Best regards,
> > Marc Strapetz
> > syntevo GmbH
> >
http://www.syntevo.com> >
http://blog.syntevo.com> >
> > 02/20/2015 20:30 - Guy Rouillier
[hidden email] [smartgit] wrote:
> >
> > > SmartGit 7 Preview 2. I have a feature branch and a develop branch. I
> > > did a pull, and both are up to date, but develop has changes I need in
> > > the feature. So I checkout the feature, then select the develop branch,
> > > right click and Merge... I select merge to working tree, and that works
> > > successfully. 21 files are affected (some added, some updated). I
> > > click the Commit button on top and get the Commit dialog. I click
> > > "Commit and Push".
> > >
> > > At this point, SmartGit puts up a message box saying that more files are
> > > affected than I'm committing. It asks if I want to commit a subset. I
> > > count the files listed, and there are 21. At this point I don't know
> > > what to do, so I tell it to commit the subset. That dialog goes away,
> > > and I'm immediately presented with *another* dialog asking me if I want
> > > to commit staged files. I tell it to commit. Now SmartGit does the
> > > commit. All my changes appear to have been committed. I looked at the
> > > log, and I see all 21 files listed.
> > >
> > > This was very confusing. This doesn't happen with SmartGit 6.5.
> > >
> > > Thanks.
> > >
> > > --
> > > Guy Rouillier
> > >
> > > ---
> > > This email has been checked for viruses by Avast antivirus software.
> > >
http://www.avast.com> > >
> > >
> >
> >
>
>
> --
> Guy Rouillier
>
> ---
> This email has been checked for viruses by Avast antivirus software.
>
http://www.avast.com>
>
Locked
