Community
Participate
Working Groups
Build Identifier: 0.10.1 Context: - Setup: Remote repository is shared via file share - Changes on the remote machine are obtained via fetch from remote repository - In the remote repository, changes are also fetch from my local (So no push used) Reproducible: Always Steps to Reproduce: 1. Commited a trivial change to local master 2. Remote PC has fetched and merged this to own local master 3. Nothing was changed on both machines 3. Another fetch on local machine shows that there is a change even if there should be non (see history screenshot) 4. If I try to merge the remote origin/master to local master, then the attached merge dialog appears: - Commits show up even if result is "up-to-date" - Last commit shows up two times
Created attachment 188158 [details] Screenshot of misleading merge dialog
Created attachment 188159 [details] Screenshot of history at point of time where strange merge dialog comes up
Duplicate of bug 366178 (which includes a fix). *** This bug has been marked as a duplicate of bug 366178 ***