Bug #9406

Jenkins builds sometime fail with "Your local changes to the following files would be overwritten by merge"

Added by intrigeri 2015-05-14 20:22:47 . Updated 2015-07-03 03:38:53 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Continuous Integration
Target version:
Tails_1.4.1
Start date:
2015-05-14
Due date:
% Done:

100%

Feature Branch:
bugfix/9406-jenkins-build-in-clean-git
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

E.g.:

+ git merge --no-edit origin/devel
error: Your local changes to the following files would be overwritten by merge:
    wiki/src/doc/about/features.de.po
    wiki/src/doc/about/features.fr.po
    wiki/src/doc/about/features.pt.po
    wiki/src/doc/advanced_topics.index.de.po
    wiki/src/doc/advanced_topics.index.fr.po
    wiki/src/doc/advanced_topics.index.pt.po
    wiki/src/doc/anonymous_internet/Tor_Browser.de.po
    wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
    wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
    wiki/src/doc/first_steps/installation.de.po
    wiki/src/news/version_1.4.de.po
    wiki/src/news/version_1.4.fr.po
    wiki/src/news/version_1.4.pt.po
    wiki/src/support/faq.de.po
    wiki/src/support/faq.fr.po
    wiki/src/support/faq.pt.po
    wiki/src/support/known_issues.de.po
    wiki/src/support/known_issues.fr.po
    wiki/src/support/known_issues.pt.po
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
    wiki/src/doc/advanced_topics/paperkey.de.po
    wiki/src/doc/advanced_topics/paperkey.fr.po
    wiki/src/doc/advanced_topics/paperkey.pt.po
Please move or remove them before you can merge.

I suspect that running git clean -fdx before merging would be enough to fix that.

Subtasks

History

#1 Updated by intrigeri 2015-05-15 09:07:44

  • Status changed from Confirmed to In Progress

Applied in changeset commit:8eb7e7c9815040a3cb6887f8ee4a806323f98995.

#2 Updated by intrigeri 2015-05-15 09:07:45

Applied in changeset commit:d81c8c335bbb02cf4c67b940741ff5ad15179249.

#3 Updated by intrigeri 2015-05-15 09:15:41

  • % Done changed from 0 to 10
  • Feature Branch set to bugfix/9406-jenkins-build-in-clean-git

#4 Updated by intrigeri 2015-05-15 09:28:13

  • Assignee deleted (intrigeri)
  • % Done changed from 10 to 50
  • QA Check set to Ready for QA

#5 Updated by intrigeri 2015-05-31 13:48:29

  • Assignee set to anonym

Explicitly assigning to the current RM, since apparently anonym missed it last time he said he had cleaned his review’n’merge plate. anonym, when you’re RM, please make sure you take care for Ready for QA tickets that are assigned to nobody :)

#6 Updated by anonym 2015-06-04 13:17:11

  • Status changed from In Progress to Fix committed
  • % Done changed from 50 to 100

Applied in changeset commit:96a1c93990cab87fb3cc74991e8105b088332e27.

#7 Updated by BitingBird 2015-06-04 16:24:59

  • QA Check changed from Ready for QA to Pass

#8 Updated by anonym 2015-06-05 13:40:32

  • Assignee deleted (anonym)

#9 Updated by intrigeri 2015-07-03 03:38:53

  • Status changed from Fix committed to Resolved