https://bugzilla.wikimedia.org/show_bug.cgi?id=36686
Web browser: ---
Bug #: 36686
Summary: Jenkins doesn't reset git "working copy" properly
Product: Wikimedia
Version: unspecified
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Testing Infrastructure
AssignedTo: [email protected]
ReportedBy: [email protected]
CC: [email protected], [email protected]
Classification: Unclassified
Mobile Platform: ---
Not sure if this is a bug with the Jenkins build script we have or whether the
merge conflict is genuine:
See:
https://integration.mediawiki.org/ci/job/MediaWiki-GIT-Fetching/1254/console
06:05:01 Auto-merging tests/qunit/suites/resources/mediawiki/mediawiki.test.js
06:05:01 CONFLICT (content): Merge conflict in
tests/qunit/suites/resources/mediawiki/mediawiki.test.js
06:05:01 Automatic merge failed; fix conflicts and then commit the result.
Currently used reset routine:
* git remote update
* git reset --hard
* git clean -x -f -d -q
* git checkout master
* git reset --hard remotes/origin/master
* git clean -x -f -d -q
---
* git fetch origin refs/changes/05/6205/3
* git merge FETCH_HEAD
--
Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
